#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;
}
/**
* 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);
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);
#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);
/* 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);