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/skge.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/skge.c')
-rw-r--r-- | drivers/net/skge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index f73ee7974003..c9dbb06f8c94 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
@@ -3214,7 +3214,7 @@ static int skge_poll(struct napi_struct *napi, int to_do) | |||
3214 | unsigned long flags; | 3214 | unsigned long flags; |
3215 | 3215 | ||
3216 | spin_lock_irqsave(&hw->hw_lock, flags); | 3216 | spin_lock_irqsave(&hw->hw_lock, flags); |
3217 | __netif_rx_complete(dev, napi); | 3217 | __netif_rx_complete(napi); |
3218 | hw->intr_mask |= napimask[skge->port]; | 3218 | hw->intr_mask |= napimask[skge->port]; |
3219 | skge_write32(hw, B0_IMSK, hw->intr_mask); | 3219 | skge_write32(hw, B0_IMSK, hw->intr_mask); |
3220 | skge_read32(hw, B0_IMSK); | 3220 | skge_read32(hw, B0_IMSK); |
@@ -3377,7 +3377,7 @@ static irqreturn_t skge_intr(int irq, void *dev_id) | |||
3377 | if (status & (IS_XA1_F|IS_R1_F)) { | 3377 | if (status & (IS_XA1_F|IS_R1_F)) { |
3378 | struct skge_port *skge = netdev_priv(hw->dev[0]); | 3378 | struct skge_port *skge = netdev_priv(hw->dev[0]); |
3379 | hw->intr_mask &= ~(IS_XA1_F|IS_R1_F); | 3379 | hw->intr_mask &= ~(IS_XA1_F|IS_R1_F); |
3380 | netif_rx_schedule(hw->dev[0], &skge->napi); | 3380 | netif_rx_schedule(&skge->napi); |
3381 | } | 3381 | } |
3382 | 3382 | ||
3383 | if (status & IS_PA_TO_TX1) | 3383 | if (status & IS_PA_TO_TX1) |
@@ -3397,7 +3397,7 @@ static irqreturn_t skge_intr(int irq, void *dev_id) | |||
3397 | 3397 | ||
3398 | if (status & (IS_XA2_F|IS_R2_F)) { | 3398 | if (status & (IS_XA2_F|IS_R2_F)) { |
3399 | hw->intr_mask &= ~(IS_XA2_F|IS_R2_F); | 3399 | hw->intr_mask &= ~(IS_XA2_F|IS_R2_F); |
3400 | netif_rx_schedule(hw->dev[1], &skge->napi); | 3400 | netif_rx_schedule(&skge->napi); |
3401 | } | 3401 | } |
3402 | 3402 | ||
3403 | if (status & IS_PA_TO_RX2) { | 3403 | if (status & IS_PA_TO_RX2) { |