diff options
| author | Dmitry Kravkov | 2011-06-14 03:32:53 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-06-15 16:56:13 +0200 |
| commit | 4b7ed8978dc79de45e9fbc202f4328388311f81f (patch) | |
| tree | 15b30fc1534118916ad093f6798225e111d47e09 /drivers/net/bnx2x/bnx2x_cmn.c | |
| parent | bnx2x: do not allocate FCoE ring if disabled (diff) | |
| download | kernel-qcow2-linux-4b7ed8978dc79de45e9fbc202f4328388311f81f.tar.gz kernel-qcow2-linux-4b7ed8978dc79de45e9fbc202f4328388311f81f.tar.xz kernel-qcow2-linux-4b7ed8978dc79de45e9fbc202f4328388311f81f.zip | |
bnx2x: remove references to intr_sem
It's not needed any more since device always operates in interrupt-driven mode
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_cmn.c')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_cmn.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c index 122cc295d7bf..14e7eb15e518 100644 --- a/drivers/net/bnx2x/bnx2x_cmn.c +++ b/drivers/net/bnx2x/bnx2x_cmn.c @@ -739,12 +739,6 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie) struct bnx2x_fastpath *fp = fp_cookie; struct bnx2x *bp = fp->bp; - /* Return here if interrupt is disabled */ - if (unlikely(atomic_read(&bp->intr_sem) != 0)) { - DP(NETIF_MSG_INTR, "called but intr_sem not 0, returning\n"); - return IRQ_HANDLED; - } - DP(BNX2X_MSG_FP, "got an MSI-X interrupt on IDX:SB " "[fp %d fw_sd %d igusb %d]\n", fp->index, fp->fw_sb_id, fp->igu_sb_id); @@ -1289,18 +1283,11 @@ static void bnx2x_napi_disable(struct bnx2x *bp) void bnx2x_netif_start(struct bnx2x *bp) { - int intr_sem; - - intr_sem = atomic_dec_and_test(&bp->intr_sem); - smp_wmb(); /* Ensure that bp->intr_sem update is SMP-safe */ - - if (intr_sem) { - if (netif_running(bp->dev)) { - bnx2x_napi_enable(bp); - bnx2x_int_enable(bp); - if (bp->state == BNX2X_STATE_OPEN) - netif_tx_wake_all_queues(bp->dev); - } + if (netif_running(bp->dev)) { + bnx2x_napi_enable(bp); + bnx2x_int_enable(bp); + if (bp->state == BNX2X_STATE_OPEN) + netif_tx_wake_all_queues(bp->dev); } } |