diff options
author | Neil Horman <nhorman@tuxdriver.com> | 2008-12-22 23:43:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-22 23:43:12 -0500 |
commit | 908a7a16b852ffd618a9127be8d62432182d81b4 (patch) | |
tree | a0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/bnx2x_main.c | |
parent | 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (diff) |
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter. This patch cleans up that api by
properly removing it..
Signed-off-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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 24d2ae8b74bf..02ab9b0ea697 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c | |||
@@ -1615,7 +1615,7 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie) | |||
1615 | prefetch(&fp->status_blk->c_status_block.status_block_index); | 1615 | prefetch(&fp->status_blk->c_status_block.status_block_index); |
1616 | prefetch(&fp->status_blk->u_status_block.status_block_index); | 1616 | prefetch(&fp->status_blk->u_status_block.status_block_index); |
1617 | 1617 | ||
1618 | netif_rx_schedule(dev, &bnx2x_fp(bp, index, napi)); | 1618 | netif_rx_schedule(&bnx2x_fp(bp, index, napi)); |
1619 | 1619 | ||
1620 | return IRQ_HANDLED; | 1620 | return IRQ_HANDLED; |
1621 | } | 1621 | } |
@@ -1654,7 +1654,7 @@ static irqreturn_t bnx2x_interrupt(int irq, void *dev_instance) | |||
1654 | prefetch(&fp->status_blk->c_status_block.status_block_index); | 1654 | prefetch(&fp->status_blk->c_status_block.status_block_index); |
1655 | prefetch(&fp->status_blk->u_status_block.status_block_index); | 1655 | prefetch(&fp->status_blk->u_status_block.status_block_index); |
1656 | 1656 | ||
1657 | netif_rx_schedule(dev, &bnx2x_fp(bp, 0, napi)); | 1657 | netif_rx_schedule(&bnx2x_fp(bp, 0, napi)); |
1658 | 1658 | ||
1659 | status &= ~mask; | 1659 | status &= ~mask; |
1660 | } | 1660 | } |
@@ -9284,7 +9284,7 @@ static int bnx2x_poll(struct napi_struct *napi, int budget) | |||
9284 | #ifdef BNX2X_STOP_ON_ERROR | 9284 | #ifdef BNX2X_STOP_ON_ERROR |
9285 | poll_panic: | 9285 | poll_panic: |
9286 | #endif | 9286 | #endif |
9287 | netif_rx_complete(bp->dev, napi); | 9287 | netif_rx_complete(napi); |
9288 | 9288 | ||
9289 | bnx2x_ack_sb(bp, FP_SB_ID(fp), USTORM_ID, | 9289 | bnx2x_ack_sb(bp, FP_SB_ID(fp), USTORM_ID, |
9290 | le16_to_cpu(fp->fp_u_idx), IGU_INT_NOP, 1); | 9290 | le16_to_cpu(fp->fp_u_idx), IGU_INT_NOP, 1); |