]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
driver/net: enic: record q_number and rss_hash for skb
authorgovindarajulu.v <govindarajulu90@gmail.com>
Wed, 4 Sep 2013 05:47:15 +0000 (11:17 +0530)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Sep 2013 16:39:32 +0000 (12:39 -0400)
The following patch sets the skb->rxhash and skb->q_number.
This is used by RPS and RFS. Kernel can make use of hw provided hash
instead of calculating the hash.

Signed-off-by: Govindarajulu Varadarajan <govindarajulu90@gmail.com>
Signed-off-by: Nishank Trivedi <nistrive@cisco.com>
Signed-off-by: Christian Benvenuti <benve@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cisco/enic/enic_main.c

index 1ab3f1809c1455ca1cdfc8f60d6b267741df84ba..93898baa25dbe43b46678023487424f62b549092 100644 (file)
@@ -1034,6 +1034,14 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
 
                skb_put(skb, bytes_written);
                skb->protocol = eth_type_trans(skb, netdev);
+               skb_record_rx_queue(skb, q_number);
+               if (netdev->features & NETIF_F_RXHASH) {
+                       skb->rxhash = rss_hash;
+                       if (rss_type & (NIC_CFG_RSS_HASH_TYPE_TCP_IPV6_EX |
+                                       NIC_CFG_RSS_HASH_TYPE_TCP_IPV6 |
+                                       NIC_CFG_RSS_HASH_TYPE_TCP_IPV4))
+                               skb->l4_rxhash = true;
+               }
 
                if ((netdev->features & NETIF_F_RXCSUM) && !csum_not_calc) {
                        skb->csum = htons(checksum);
@@ -2209,6 +2217,7 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
 
        netif_set_real_num_tx_queues(netdev, enic->wq_count);
+       netif_set_real_num_rx_queues(netdev, enic->rq_count);
 
        /* Setup notification timer, HW reset task, and wq locks
         */
@@ -2258,6 +2267,8 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (ENIC_SETTING(enic, TSO))
                netdev->hw_features |= NETIF_F_TSO |
                        NETIF_F_TSO6 | NETIF_F_TSO_ECN;
+       if (ENIC_SETTING(enic, RSS))
+               netdev->hw_features |= NETIF_F_RXHASH;
        if (ENIC_SETTING(enic, RXCSUM))
                netdev->hw_features |= NETIF_F_RXCSUM;