1 files changed, 29 insertions, 11 deletions

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 2c28621eb30b..d6c4bd8438ec 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -54,9 +54,8 @@
 #define MAJ 3
 #define MIN 0
 #define BUILD 6
-#define KFIX 2
 #define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
-__stringify(BUILD) "-k" __stringify(KFIX)
+__stringify(BUILD) "-k"
 char igb_driver_name[] = "igb";
 char igb_driver_version[] = DRV_VERSION;
 static const char igb_driver_string[] =
@@ -1749,6 +1748,21 @@ void igb_reset(struct igb_adapter *adapter)
         igb_get_phy_info(hw);
 }
 
+static int igb_set_features(struct net_device *netdev, u32 features)
+{
+        struct igb_adapter *adapter = netdev_priv(netdev);
+        int i;
+
+        for (i = 0; i < adapter->num_rx_queues; i++) {
+                if (features & NETIF_F_RXCSUM)
+                        adapter->rx_ring[i]->flags |= IGB_RING_FLAG_RX_CSUM;
+                else
+                        adapter->rx_ring[i]->flags &= ~IGB_RING_FLAG_RX_CSUM;
+        }
+
+        return 0;
+}
+
 static const struct net_device_ops igb_netdev_ops = {
         .ndo_open               = igb_open,
         .ndo_stop               = igb_close,
@@ -1771,6 +1785,7 @@ static const struct net_device_ops igb_netdev_ops = {
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = igb_netpoll,
 #endif
+        .ndo_set_features       = igb_set_features,
 };
 
 /**
@@ -1910,17 +1925,18 @@ static int __devinit igb_probe(struct pci_dev *pdev,
                 dev_info(&pdev->dev,
                         "PHY reset is blocked due to SOL/IDER session.\n");
 
-        netdev->features = NETIF_F_SG |
+        netdev->hw_features = NETIF_F_SG |
                            NETIF_F_IP_CSUM |
+                           NETIF_F_IPV6_CSUM |
+                           NETIF_F_TSO |
+                           NETIF_F_TSO6 |
+                           NETIF_F_RXCSUM;
+
+        netdev->features = netdev->hw_features |
                            NETIF_F_HW_VLAN_TX |
                            NETIF_F_HW_VLAN_RX |
                            NETIF_F_HW_VLAN_FILTER;
 
-        netdev->features |= NETIF_F_IPV6_CSUM;
-        netdev->features |= NETIF_F_TSO;
-        netdev->features |= NETIF_F_TSO6;
-        netdev->features |= NETIF_F_GRO;
-
         netdev->vlan_features |= NETIF_F_TSO;
         netdev->vlan_features |= NETIF_F_TSO6;
         netdev->vlan_features |= NETIF_F_IP_CSUM;
@@ -1932,8 +1948,10 @@ static int __devinit igb_probe(struct pci_dev *pdev,
                 netdev->vlan_features |= NETIF_F_HIGHDMA;
         }
 
-        if (hw->mac.type >= e1000_82576)
+        if (hw->mac.type >= e1000_82576) {
+                netdev->hw_features |= NETIF_F_SCTP_CSUM;
                 netdev->features |= NETIF_F_SCTP_CSUM;
+        }
 
         adapter->en_mng_pt = igb_enable_mng_pass_thru(hw);
 
@@ -6249,7 +6267,7 @@ s32 igb_read_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
         struct igb_adapter *adapter = hw->back;
         u16 cap_offset;
 
-        cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
+        cap_offset = adapter->pdev->pcie_cap;
         if (!cap_offset)
                 return -E1000_ERR_CONFIG;
 
@@ -6263,7 +6281,7 @@ s32 igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value)
         struct igb_adapter *adapter = hw->back;
         u16 cap_offset;
 
-        cap_offset = pci_find_capability(adapter->pdev, PCI_CAP_ID_EXP);
+        cap_offset = adapter->pdev->pcie_cap;
         if (!cap_offset)
                 return -E1000_ERR_CONFIG;