diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/enic/enic.h | 6 | ||||
-rw-r--r-- | drivers/net/enic/enic_main.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index 2ac891b58db3..aee5256e522b 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h | |||
@@ -32,13 +32,13 @@ | |||
32 | 32 | ||
33 | #define DRV_NAME "enic" | 33 | #define DRV_NAME "enic" |
34 | #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" | 34 | #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" |
35 | #define DRV_VERSION "2.1.1.8" | 35 | #define DRV_VERSION "2.1.1.9" |
36 | #define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc" | 36 | #define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc" |
37 | 37 | ||
38 | #define ENIC_BARS_MAX 6 | 38 | #define ENIC_BARS_MAX 6 |
39 | 39 | ||
40 | #define ENIC_WQ_MAX 8 | 40 | #define ENIC_WQ_MAX 1 |
41 | #define ENIC_RQ_MAX 8 | 41 | #define ENIC_RQ_MAX 1 |
42 | #define ENIC_CQ_MAX (ENIC_WQ_MAX + ENIC_RQ_MAX) | 42 | #define ENIC_CQ_MAX (ENIC_WQ_MAX + ENIC_RQ_MAX) |
43 | #define ENIC_INTR_MAX (ENIC_CQ_MAX + 2) | 43 | #define ENIC_INTR_MAX (ENIC_CQ_MAX + 2) |
44 | 44 | ||
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index d1aa80770541..4f1710e31eb4 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c | |||
@@ -2080,7 +2080,7 @@ static void enic_reset(struct work_struct *work) | |||
2080 | static int enic_set_intr_mode(struct enic *enic) | 2080 | static int enic_set_intr_mode(struct enic *enic) |
2081 | { | 2081 | { |
2082 | unsigned int n = min_t(unsigned int, enic->rq_count, ENIC_RQ_MAX); | 2082 | unsigned int n = min_t(unsigned int, enic->rq_count, ENIC_RQ_MAX); |
2083 | unsigned int m = 1; | 2083 | unsigned int m = min_t(unsigned int, enic->wq_count, ENIC_WQ_MAX); |
2084 | unsigned int i; | 2084 | unsigned int i; |
2085 | 2085 | ||
2086 | /* Set interrupt mode (INTx, MSI, MSI-X) depending | 2086 | /* Set interrupt mode (INTx, MSI, MSI-X) depending |