aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x_main.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-01-19 19:43:59 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-21 17:33:50 -0500
commit288379f050284087578b77e04f040b57db3db3f8 (patch)
treeac5f5c83e2778a1966327d87316fc94067363b45 /drivers/net/bnx2x_main.c
parent627af770c63acddc2402dd19fec70df5c3ad8ab7 (diff)
net: Remove redundant NAPI functions
Following the removal of the unused struct net_device * parameter from the NAPI functions named *netif_rx_* in commit 908a7a1, they are exactly equivalent to the corresponding *napi_* functions and are therefore redundant. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x_main.c')
-rw-r--r--drivers/net/bnx2x_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 074374ff93f3..21764bfc048e 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -1647,7 +1647,7 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie)
1647 prefetch(&fp->status_blk->c_status_block.status_block_index); 1647 prefetch(&fp->status_blk->c_status_block.status_block_index);
1648 prefetch(&fp->status_blk->u_status_block.status_block_index); 1648 prefetch(&fp->status_blk->u_status_block.status_block_index);
1649 1649
1650 netif_rx_schedule(&bnx2x_fp(bp, index, napi)); 1650 napi_schedule(&bnx2x_fp(bp, index, napi));
1651 1651
1652 return IRQ_HANDLED; 1652 return IRQ_HANDLED;
1653} 1653}
@@ -1686,7 +1686,7 @@ static irqreturn_t bnx2x_interrupt(int irq, void *dev_instance)
1686 prefetch(&fp->status_blk->c_status_block.status_block_index); 1686 prefetch(&fp->status_blk->c_status_block.status_block_index);
1687 prefetch(&fp->status_blk->u_status_block.status_block_index); 1687 prefetch(&fp->status_blk->u_status_block.status_block_index);
1688 1688
1689 netif_rx_schedule(&bnx2x_fp(bp, 0, napi)); 1689 napi_schedule(&bnx2x_fp(bp, 0, napi));
1690 1690
1691 status &= ~mask; 1691 status &= ~mask;
1692 } 1692 }
@@ -9339,7 +9339,7 @@ static int bnx2x_poll(struct napi_struct *napi, int budget)
9339#ifdef BNX2X_STOP_ON_ERROR 9339#ifdef BNX2X_STOP_ON_ERROR
9340poll_panic: 9340poll_panic:
9341#endif 9341#endif
9342 netif_rx_complete(napi); 9342 napi_complete(napi);
9343 9343
9344 bnx2x_ack_sb(bp, FP_SB_ID(fp), USTORM_ID, 9344 bnx2x_ack_sb(bp, FP_SB_ID(fp), USTORM_ID,
9345 le16_to_cpu(fp->fp_u_idx), IGU_INT_NOP, 1); 9345 le16_to_cpu(fp->fp_u_idx), IGU_INT_NOP, 1);