diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-01 13:45:57 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-01 13:45:57 +0000 |
commit | 55a912f43e9762638e3b3d0fc640d903f29ba8b7 (patch) | |
tree | 80f32338e0470a97524f0617bf835586004d810c /target/linux/imx6/patches-3.18/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch | |
parent | 9130e4dc3267e4d1f25e22cddf798991bc6197cf (diff) | |
download | upstream-55a912f43e9762638e3b3d0fc640d903f29ba8b7.tar.gz upstream-55a912f43e9762638e3b3d0fc640d903f29ba8b7.tar.bz2 upstream-55a912f43e9762638e3b3d0fc640d903f29ba8b7.zip |
kernel: update kernel 3.18 to version 3.18.23
Changelog:
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.22
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.23
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47334
Diffstat (limited to 'target/linux/imx6/patches-3.18/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch')
-rw-r--r-- | target/linux/imx6/patches-3.18/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-3.18/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch b/target/linux/imx6/patches-3.18/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch index d503e911c5..129a0bcbae 100644 --- a/target/linux/imx6/patches-3.18/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch +++ b/target/linux/imx6/patches-3.18/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> -@@ -2231,6 +2232,126 @@ static s32 igb_init_i2c(struct igb_adapt +@@ -2237,6 +2238,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 -@@ -2653,6 +2774,13 @@ static int igb_probe(struct pci_dev *pde +@@ -2659,6 +2780,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: -@@ -2796,6 +2924,10 @@ static void igb_remove(struct pci_dev *p +@@ -2802,6 +2930,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 -@@ -3101,6 +3233,12 @@ static int __igb_open(struct net_device +@@ -3115,6 +3247,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); -@@ -7097,21 +7235,41 @@ void igb_alloc_rx_buffers(struct igb_rin +@@ -7111,21 +7249,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); |