openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cnic: Check device state before reading the kcq pointer in IRQ 

If the device is down, the kcq pointer may be NULL.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan 2010-12-23 08:38:30 +00:00 committed by David S. Miller
parent 4aacb7afb6
commit eaaa6e9c22
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/cnic.c
View File

@ -2352,11 +2352,12 @@ static u32 cnic_service_bnx2_queues(struct cnic_dev *dev)
static int cnic_service_bnx2(void *data, void *status_blk) static int cnic_service_bnx2(void *data, void *status_blk)
{ {
struct cnic_dev *dev = data; struct cnic_dev *dev = data;
struct cnic_local *cp = dev->cnic_priv;
u32 status_idx = *cp->kcq1.status_idx_ptr;
if (unlikely(!test_bit(CNIC_F_CNIC_UP, &dev->flags))) if (unlikely(!test_bit(CNIC_F_CNIC_UP, &dev->flags))) {
return status_idx; struct status_block *sblk = status_blk;
return sblk->status_idx;
}
return cnic_service_bnx2_queues(dev); return cnic_service_bnx2_queues(dev);
} }
@ -2375,9 +2376,10 @@ static void cnic_service_bnx2_msix(unsigned long data)
static void cnic_doirq(struct cnic_dev *dev) static void cnic_doirq(struct cnic_dev *dev)
{ {
struct cnic_local *cp = dev->cnic_priv; struct cnic_local *cp = dev->cnic_priv;
u16 prod = cp->kcq1.sw_prod_idx & MAX_KCQ_IDX;
if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags))) { if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags))) {
u16 prod = cp->kcq1.sw_prod_idx & MAX_KCQ_IDX;
prefetch(cp->status_blk.gen); prefetch(cp->status_blk.gen);
prefetch(&cp->kcq1.kcq[KCQ_PG(prod)][KCQ_IDX(prod)]); prefetch(&cp->kcq1.kcq[KCQ_PG(prod)][KCQ_IDX(prod)]);