From fa7d2a772e6630ea077b1f3eaf2037172cde773e Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Wed, 7 Apr 2010 20:53:54 -0700 Subject: [PATCH] --- yaml --- r: 189849 b: refs/heads/master c: 94824f3dbe0d3f62470603bbb18efb5510aaf07c h: refs/heads/master i: 189847: e3a963afe3a947285165b97a083219564c1f2e7c v: v3 --- [refs] | 2 +- trunk/drivers/net/cnic.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d91e185ec211..47b5ccbd5659 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04b1a22350e1e6464c3109886385178d119dbbb4 +refs/heads/master: 94824f3dbe0d3f62470603bbb18efb5510aaf07c diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c index 9781942992e9..4b451a7c03e9 100644 --- a/trunk/drivers/net/cnic.c +++ b/trunk/drivers/net/cnic.c @@ -2334,13 +2334,13 @@ static int cnic_service_bnx2x(void *data, void *status_blk) struct cnic_local *cp = dev->cnic_priv; u16 prod = cp->kcq_prod_idx & MAX_KCQ_IDX; - prefetch(cp->status_blk.bnx2x); - prefetch(&cp->kcq[KCQ_PG(prod)][KCQ_IDX(prod)]); + if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags))) { + prefetch(cp->status_blk.bnx2x); + prefetch(&cp->kcq[KCQ_PG(prod)][KCQ_IDX(prod)]); - if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags))) tasklet_schedule(&cp->cnic_irq_task); - - cnic_chk_pkt_rings(cp); + cnic_chk_pkt_rings(cp); + } return 0; }