enic: Add support for multiple hardware receive queues

Add support for multiple hardware receive queues. The ingress traffic is hashed into one of the receive queues based on IP or TCP or both headers. The max no. of receive queues supported is 8.

Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David Wang <dwang2@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 23 deletions

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index ae623206f180..c91d364c5527 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -28,10 +28,11 @@
 #include "vnic_intr.h"
 #include "vnic_stats.h"
 #include "vnic_nic.h"
+#include "vnic_rss.h"
 
 #define DRV_NAME                "enic"
 #define DRV_DESCRIPTION         "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION             "1.4.1.2a"
+#define DRV_VERSION             "1.4.1.6"
 #define DRV_COPYRIGHT           "Copyright 2008-2010 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX           6
@@ -41,25 +42,6 @@
 #define ENIC_CQ_MAX             (ENIC_WQ_MAX + ENIC_RQ_MAX)
 #define ENIC_INTR_MAX           (ENIC_CQ_MAX + 2)
 
-enum enic_cq_index {
-        ENIC_CQ_RQ,
-        ENIC_CQ_WQ,
-};
-
-enum enic_intx_intr_index {
-        ENIC_INTX_WQ_RQ,
-        ENIC_INTX_ERR,
-        ENIC_INTX_NOTIFY,
-};
-
-enum enic_msix_intr_index {
-        ENIC_MSIX_RQ,
-        ENIC_MSIX_WQ,
-        ENIC_MSIX_ERR,
-        ENIC_MSIX_NOTIFY,
-        ENIC_MSIX_MAX,
-};
-
 struct enic_msix_entry {
         int requested;
         char devname[IFNAMSIZ];
@@ -90,8 +72,8 @@ struct enic {
         struct vnic_dev *vdev;
         struct timer_list notify_timer;
         struct work_struct reset;
-        struct msix_entry msix_entry[ENIC_MSIX_MAX];
-        struct enic_msix_entry msix[ENIC_MSIX_MAX];
+        struct msix_entry msix_entry[ENIC_INTR_MAX];
+        struct enic_msix_entry msix[ENIC_INTR_MAX];
         u32 msg_enable;
         spinlock_t devcmd_lock;
         u8 mac_addr[ETH_ALEN];
@@ -118,7 +100,7 @@ struct enic {
         int (*rq_alloc_buf)(struct vnic_rq *rq);
         u64 rq_truncated_pkts;
         u64 rq_bad_fcs;
-        struct napi_struct napi;
+        struct napi_struct napi[ENIC_RQ_MAX];
 
         /* interrupt resource cache line section */
         ____cacheline_aligned struct vnic_intr intr[ENIC_INTR_MAX];