igb: add support for NETIF_F_RXHASH

This patch adds support for Rx hashing.

(cherry picked from commit 077887c386226e4def56898449c26bb15f523728)
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by:  Aaron Brown  <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index ee7b49b29571cd55b76be9676355d46a03dbdf64..9956b97384355bb6cfc326bc657196f917de8fe5 100644 (file)
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1979,23 +1979,32 @@ static int __devinit igb_probe(struct pci_dev *pdev,
                dev_info(&pdev->dev,
                        "PHY reset is blocked due to SOL/IDER session.\n");
 
-       netdev->hw_features = NETIF_F_SG |
-                          NETIF_F_IP_CSUM |
-                          NETIF_F_IPV6_CSUM |
-                          NETIF_F_TSO |
-                          NETIF_F_TSO6 |
-                          NETIF_F_RXCSUM |
-                          NETIF_F_HW_VLAN_RX;
-
-       netdev->features = netdev->hw_features |
-                          NETIF_F_HW_VLAN_TX |
-                          NETIF_F_HW_VLAN_FILTER;
-
-       netdev->vlan_features |= NETIF_F_TSO;
-       netdev->vlan_features |= NETIF_F_TSO6;
-       netdev->vlan_features |= NETIF_F_IP_CSUM;
-       netdev->vlan_features |= NETIF_F_IPV6_CSUM;
-       netdev->vlan_features |= NETIF_F_SG;
+       /*
+        * features is initialized to 0 in allocation, it might have bits
+        * set by igb_sw_init so we should use an or instead of an
+        * assignment.
+        */
+       netdev->features |= NETIF_F_SG |
+                           NETIF_F_IP_CSUM |
+                           NETIF_F_IPV6_CSUM |
+                           NETIF_F_TSO |
+                           NETIF_F_TSO6 |
+                           NETIF_F_RXHASH |
+                           NETIF_F_RXCSUM |
+                           NETIF_F_HW_VLAN_RX |
+                           NETIF_F_HW_VLAN_TX;
+
+       /* copy netdev features into list of user selectable features */
+       netdev->hw_features |= netdev->features;
+
+       /* set this bit last since it cannot be part of hw_features */
+       netdev->features |= NETIF_F_HW_VLAN_FILTER;
+
+       netdev->vlan_features |= NETIF_F_TSO |
+                                NETIF_F_TSO6 |
+                                NETIF_F_IP_CSUM |
+                                NETIF_F_IPV6_CSUM |
+                                NETIF_F_SG;
 
        if (pci_using_dac) {
                netdev->features |= NETIF_F_HIGHDMA;
@@ -5828,6 +5837,14 @@ static inline void igb_rx_checksum(struct igb_ring *ring,
                le32_to_cpu(rx_desc->wb.upper.status_error));
 }
 
+static inline void igb_rx_hash(struct igb_ring *ring,
+                              union e1000_adv_rx_desc *rx_desc,
+                              struct sk_buff *skb)
+{
+       if (ring->netdev->features & NETIF_F_RXHASH)
+               skb->rxhash = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
+}
+
 static void igb_rx_hwtstamp(struct igb_q_vector *q_vector,
                            union e1000_adv_rx_desc *rx_desc,
                            struct sk_buff *skb)
@@ -5960,6 +5977,7 @@ static bool igb_clean_rx_irq(struct igb_q_vector *q_vector, int budget)
                }
 
                igb_rx_hwtstamp(q_vector, rx_desc, skb);
+               igb_rx_hash(rx_ring, rx_desc, skb);
                igb_rx_checksum(rx_ring, rx_desc, skb);
 
                if (igb_test_staterr(rx_desc, E1000_RXD_STAT_VP)) {