diff options
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r-- | drivers/net/bnx2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index d4a3dac21dcf..e817802b2483 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -3053,7 +3053,7 @@ bnx2_msi(int irq, void *dev_instance) | |||
3053 | if (unlikely(atomic_read(&bp->intr_sem) != 0)) | 3053 | if (unlikely(atomic_read(&bp->intr_sem) != 0)) |
3054 | return IRQ_HANDLED; | 3054 | return IRQ_HANDLED; |
3055 | 3055 | ||
3056 | netif_rx_schedule(&bnapi->napi); | 3056 | napi_schedule(&bnapi->napi); |
3057 | 3057 | ||
3058 | return IRQ_HANDLED; | 3058 | return IRQ_HANDLED; |
3059 | } | 3059 | } |
@@ -3070,7 +3070,7 @@ bnx2_msi_1shot(int irq, void *dev_instance) | |||
3070 | if (unlikely(atomic_read(&bp->intr_sem) != 0)) | 3070 | if (unlikely(atomic_read(&bp->intr_sem) != 0)) |
3071 | return IRQ_HANDLED; | 3071 | return IRQ_HANDLED; |
3072 | 3072 | ||
3073 | netif_rx_schedule(&bnapi->napi); | 3073 | napi_schedule(&bnapi->napi); |
3074 | 3074 | ||
3075 | return IRQ_HANDLED; | 3075 | return IRQ_HANDLED; |
3076 | } | 3076 | } |
@@ -3106,9 +3106,9 @@ bnx2_interrupt(int irq, void *dev_instance) | |||
3106 | if (unlikely(atomic_read(&bp->intr_sem) != 0)) | 3106 | if (unlikely(atomic_read(&bp->intr_sem) != 0)) |
3107 | return IRQ_HANDLED; | 3107 | return IRQ_HANDLED; |
3108 | 3108 | ||
3109 | if (netif_rx_schedule_prep(&bnapi->napi)) { | 3109 | if (napi_schedule_prep(&bnapi->napi)) { |
3110 | bnapi->last_status_idx = sblk->status_idx; | 3110 | bnapi->last_status_idx = sblk->status_idx; |
3111 | __netif_rx_schedule(&bnapi->napi); | 3111 | __napi_schedule(&bnapi->napi); |
3112 | } | 3112 | } |
3113 | 3113 | ||
3114 | return IRQ_HANDLED; | 3114 | return IRQ_HANDLED; |
@@ -3218,7 +3218,7 @@ static int bnx2_poll_msix(struct napi_struct *napi, int budget) | |||
3218 | rmb(); | 3218 | rmb(); |
3219 | if (likely(!bnx2_has_fast_work(bnapi))) { | 3219 | if (likely(!bnx2_has_fast_work(bnapi))) { |
3220 | 3220 | ||
3221 | netif_rx_complete(napi); | 3221 | napi_complete(napi); |
3222 | REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD, bnapi->int_num | | 3222 | REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD, bnapi->int_num | |
3223 | BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | | 3223 | BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | |
3224 | bnapi->last_status_idx); | 3224 | bnapi->last_status_idx); |
@@ -3251,7 +3251,7 @@ static int bnx2_poll(struct napi_struct *napi, int budget) | |||
3251 | 3251 | ||
3252 | rmb(); | 3252 | rmb(); |
3253 | if (likely(!bnx2_has_work(bnapi))) { | 3253 | if (likely(!bnx2_has_work(bnapi))) { |
3254 | netif_rx_complete(napi); | 3254 | napi_complete(napi); |
3255 | if (likely(bp->flags & BNX2_FLAG_USING_MSI_OR_MSIX)) { | 3255 | if (likely(bp->flags & BNX2_FLAG_USING_MSI_OR_MSIX)) { |
3256 | REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD, | 3256 | REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD, |
3257 | BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | | 3257 | BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | |