kernel: update 3.14 to 3.14.28

[openwrt.git] / target / linux / imx6 / patches-3.14 / 204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch

diff --git a/target/linux/imx6/patches-3.14/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch b/target/linux/imx6/patches-3.14/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch
index ab26601..0bcbbd7 100644 (file)
--- a/target/linux/imx6/patches-3.14/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch
+++ b/target/linux/imx6/patches-3.14/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch
@@ -89,7 +89,7 @@ Date:   Thu May 15 12:36:23 2014 -0700
  #include <linux/delay.h>
  #include <linux/interrupt.h>
  #include <linux/ip.h>
-@@ -2189,6 +2190,126 @@ static s32 igb_init_i2c(struct igb_adapt
+@@ -2191,6 +2192,126 @@ static s32 igb_init_i2c(struct igb_adapt
        return status;
  }
  
@@ -216,7 +216,7 @@ Date:   Thu May 15 12:36:23 2014 -0700
  /**
   *  igb_probe - Device Initialization Routine
   *  @pdev: PCI device information struct
-@@ -2591,6 +2712,13 @@ static int igb_probe(struct pci_dev *pde
+@@ -2593,6 +2714,13 @@ static int igb_probe(struct pci_dev *pde
        }
  
        pm_runtime_put_noidle(&pdev->dev);
@@ -230,7 +230,7 @@ Date:   Thu May 15 12:36:23 2014 -0700
        return 0;
  
  err_register:
-@@ -2734,6 +2862,10 @@ static void igb_remove(struct pci_dev *p
+@@ -2736,6 +2864,10 @@ static void igb_remove(struct pci_dev *p
        struct e1000_hw *hw = &adapter->hw;
  
        pm_runtime_get_noresume(&pdev->dev);
@@ -241,7 +241,7 @@ Date:   Thu May 15 12:36:23 2014 -0700
  #ifdef CONFIG_IGB_HWMON
        igb_sysfs_exit(adapter);
  #endif
-@@ -3038,6 +3170,12 @@ static int __igb_open(struct net_device 
+@@ -3040,6 +3172,12 @@ static int __igb_open(struct net_device
        if (!resuming)
                pm_runtime_put(&pdev->dev);
  
@@ -254,7 +254,7 @@ Date:   Thu May 15 12:36:23 2014 -0700
        /* start the watchdog. */
        hw->mac.get_link_status = 1;
        schedule_work(&adapter->watchdog_task);
-@@ -7093,21 +7231,41 @@ void igb_alloc_rx_buffers(struct igb_rin
+@@ -7095,21 +7233,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);