diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-07-13 12:07:08 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-07-13 15:39:15 +0200 |
| commit | efa1960abb390d696704d029507dff671cc271fd (patch) | |
| tree | fa9fb6267c4357fe51051dd5545ba2ce81b3e1b8 /target/linux/imx6/patches-4.4 | |
| parent | d6b3b44d9798dfd6aba3758843acbf310b98a853 (diff) | |
| download | upstream-efa1960abb390d696704d029507dff671cc271fd.tar.gz upstream-efa1960abb390d696704d029507dff671cc271fd.tar.bz2 upstream-efa1960abb390d696704d029507dff671cc271fd.zip | |
kernel: update kernel 4.4 to version 4.4.15
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/imx6/patches-4.4')
| -rw-r--r-- | target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch b/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch index a179900313..2b1cf9627b 100644 --- a/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch +++ b/target/linux/imx6/patches-4.4/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch @@ -94,7 +94,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/ip.h> -@@ -2223,6 +2224,126 @@ static s32 igb_init_i2c(struct igb_adapt +@@ -2217,6 +2218,126 @@ static s32 igb_init_i2c(struct igb_adapt return status; } @@ -221,7 +221,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> /** * igb_probe - Device Initialization Routine * @pdev: PCI device information struct -@@ -2645,6 +2766,13 @@ static int igb_probe(struct pci_dev *pde +@@ -2639,6 +2760,13 @@ static int igb_probe(struct pci_dev *pde } } pm_runtime_put_noidle(&pdev->dev); @@ -235,7 +235,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> return 0; err_register: -@@ -2792,6 +2920,10 @@ static void igb_remove(struct pci_dev *p +@@ -2786,6 +2914,10 @@ static void igb_remove(struct pci_dev *p struct e1000_hw *hw = &adapter->hw; pm_runtime_get_noresume(&pdev->dev); @@ -246,7 +246,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> #ifdef CONFIG_IGB_HWMON igb_sysfs_exit(adapter); #endif -@@ -3108,6 +3240,12 @@ static int __igb_open(struct net_device +@@ -3102,6 +3234,12 @@ static int __igb_open(struct net_device if (!resuming) pm_runtime_put(&pdev->dev); @@ -259,7 +259,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> /* start the watchdog. */ hw->mac.get_link_status = 1; schedule_work(&adapter->watchdog_task); -@@ -7099,21 +7237,41 @@ void igb_alloc_rx_buffers(struct igb_rin +@@ -7093,21 +7231,41 @@ void igb_alloc_rx_buffers(struct igb_rin static int igb_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) { struct igb_adapter *adapter = netdev_priv(netdev); |