Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / enic / enic.h

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index f239aa8c6f4ce6d6e86341ab09ca461fdd76f89e..c91d364c55279e81425ba50d80ec8cbcb9ec54c0 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -32,7 +32,7 @@
 
 #define DRV_NAME               "enic"
 #define DRV_DESCRIPTION                "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION            "1.4.1.1"
+#define DRV_VERSION            "1.4.1.6"
 #define DRV_COPYRIGHT          "Copyright 2008-2010 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX          6
@@ -42,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];
@@ -91,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];
@@ -119,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];