| Message ID | 20110217185322.2476.10728.stgit@savbu-pc100.cisco.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Vasanthy Kolluri <vkolluri@cisco.com> Date: Thu, 17 Feb 2011 10:53:22 -0800 > From: Vasanthy Kolluri <vkolluri@cisco.com> > > > > Signed-off-by: Christian Benvenuti <benve@cisco.com> > Signed-off-by: Danny Guo <dannguo@cisco.com> > Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com> > Signed-off-by: Roopa Prabhu <roprabhu@cisco.com> > Signed-off-by: David Wang <dwang2@cisco.com> You can't make a very serious change like this with such a terse commit message, you have to explain exactly why this change is being made. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Dave, Sorry for the short description. We believe that our earlier patch for supporting multiple hardware receive queues per enic device requires more internal testing. At this point, we think that it's best to disable the use of multiple receive queues. We believe that the current patch will provide an effective means for the same. Thanks Vasanthy -----Original Message----- From: David Miller [mailto:davem@davemloft.net] Sent: Thursday, February 17, 2011 2:13 PM To: Vasanthy Kolluri (vkolluri) Cc: netdev@vger.kernel.org Subject: Re: [net-next-2.6 PATCH 3/3] enic: Always use single transmit and single receive hardware queues per device From: Vasanthy Kolluri <vkolluri@cisco.com> Date: Thu, 17 Feb 2011 10:53:22 -0800 > From: Vasanthy Kolluri <vkolluri@cisco.com> > > > > Signed-off-by: Christian Benvenuti <benve@cisco.com> > Signed-off-by: Danny Guo <dannguo@cisco.com> > Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com> > Signed-off-by: Roopa Prabhu <roprabhu@cisco.com> > Signed-off-by: David Wang <dwang2@cisco.com> You can't make a very serious change like this with such a terse commit message, you have to explain exactly why this change is being made. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: "Vasanthy Kolluri (vkolluri)" <vkolluri@cisco.com> Date: Thu, 17 Feb 2011 14:45:56 -0800 > Sorry for the short description. > > We believe that our earlier patch for supporting multiple hardware > receive queues per enic device requires more internal testing. At this > point, we think that it's best to disable the use of multiple receive > queues. We believe that the current patch will provide an effective > means for the same. Well then, resubmit your patch with an appropriate commit message. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index 2ac891b..aee5256 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h @@ -32,13 +32,13 @@ #define DRV_NAME "enic" #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" -#define DRV_VERSION "2.1.1.8" +#define DRV_VERSION "2.1.1.9" #define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc" #define ENIC_BARS_MAX 6 -#define ENIC_WQ_MAX 8 -#define ENIC_RQ_MAX 8 +#define ENIC_WQ_MAX 1 +#define ENIC_RQ_MAX 1 #define ENIC_CQ_MAX (ENIC_WQ_MAX + ENIC_RQ_MAX) #define ENIC_INTR_MAX (ENIC_CQ_MAX + 2) diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index d1aa807..4f1710e 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) static int enic_set_intr_mode(struct enic *enic) { unsigned int n = min_t(unsigned int, enic->rq_count, ENIC_RQ_MAX); - unsigned int m = 1; + unsigned int m = min_t(unsigned int, enic->wq_count, ENIC_WQ_MAX); unsigned int i; /* Set interrupt mode (INTx, MSI, MSI-X) depending