enic: Bug Fix: Pass napi reference to the isr that services receive queue
Subsystems (2)
PATCH 1/1 enic: Bug Fix: Pass napi reference to the isr that services receive queue
From: Vasanthy Kolluri <[email protected]>
Pass reference to napi instead of enic device to the isr that services receive queue.
Signed-off-by Vasanthy Kolluri <[email protected]>
Signed-off-by Roopa Prabhu <[email protected]>
Signed-off-by David Wang <[email protected]>
--- drivers/net/enic/enic.h | 2 +- drivers/net/enic/enic_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/net/enic/enic.h +1 -1
@@ -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
drivers/net/enic/enic_main.c +2 -1
@@ -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);
David Miller
maintainerFrom: Vasanthy Kolluri <[email protected]>
Date: Wed, 01 Dec 2010 23:08:33 -0800
Quoted 7 lines
From: Vasanthy Kolluri <[email protected]>
Pass reference to napi instead of enic device to the isr that services receive queue.
Signed-off-by Vasanthy Kolluri <[email protected]>Signed-off-by Roopa Prabhu <[email protected]>Signed-off-by David Wang <[email protected]>
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.