Message ID | 20101202070833.4213.8072.stgit@savbu-pc100.cisco.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
From: Vasanthy Kolluri <vkolluri@cisco.com> Date: Wed, 01 Dec 2010 23:08:33 -0800 > From: Vasanthy Kolluri <vkolluri@cisco.com> > > Pass reference to napi instead of enic device to the isr that services receive queue. > > Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com> > Signed-off-by: Roopa Prabhu <roprabhu@cisco.com> > Signed-off-by: David Wang <dwang2@cisco.com> This is a pretty simple and real bug fix, so I'd rather you resubmit this targetted for net-2.6 instead of net-next-2.6 It won't apply as-is to net-2.6 because the enic driver version number is different there. Thanks. -- 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 7067254..a930fb9 100644 --- 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.7" +#define DRV_VERSION "1.4.1.8" #define DRV_COPYRIGHT "Copyright 2008-2010 Cisco Systems, Inc" #define ENIC_BARS_MAX 6 diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 9f293fa..828a436 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -1962,7 +1962,8 @@ static void enic_poll_controller(struct net_device *netdev) case VNIC_DEV_INTR_MODE_MSIX: for (i = 0; i < enic->rq_count; i++) { intr = enic_msix_rq_intr(enic, i); - enic_isr_msix_rq(enic->msix_entry[intr].vector, enic); + enic_isr_msix_rq(enic->msix_entry[intr].vector, + &enic->napi[i]); } intr = enic_msix_wq_intr(enic, i); enic_isr_msix_wq(enic->msix_entry[intr].vector, enic);