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/sb1250-mac.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/sb1250-mac.c')
-rw-r--r-- | drivers/net/sb1250-mac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index 480caec1e024..31e38fae017f 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
@@ -2039,9 +2039,9 @@ static irqreturn_t sbmac_intr(int irq,void *dev_instance) | |||
2039 | sbdma_tx_process(sc,&(sc->sbm_txdma), 0); | 2039 | sbdma_tx_process(sc,&(sc->sbm_txdma), 0); |
2040 | 2040 | ||
2041 | if (isr & (M_MAC_INT_CHANNEL << S_MAC_RX_CH0)) { | 2041 | if (isr & (M_MAC_INT_CHANNEL << S_MAC_RX_CH0)) { |
2042 | if (netif_rx_schedule_prep(dev, &sc->napi)) { | 2042 | if (netif_rx_schedule_prep(&sc->napi)) { |
2043 | __raw_writeq(0, sc->sbm_imr); | 2043 | __raw_writeq(0, sc->sbm_imr); |
2044 | __netif_rx_schedule(dev, &sc->napi); | 2044 | __netif_rx_schedule(&sc->napi); |
2045 | /* Depend on the exit from poll to reenable intr */ | 2045 | /* Depend on the exit from poll to reenable intr */ |
2046 | } | 2046 | } |
2047 | else { | 2047 | else { |
@@ -2667,7 +2667,7 @@ static int sbmac_poll(struct napi_struct *napi, int budget) | |||
2667 | sbdma_tx_process(sc, &(sc->sbm_txdma), 1); | 2667 | sbdma_tx_process(sc, &(sc->sbm_txdma), 1); |
2668 | 2668 | ||
2669 | if (work_done < budget) { | 2669 | if (work_done < budget) { |
2670 | netif_rx_complete(dev, napi); | 2670 | netif_rx_complete(napi); |
2671 | 2671 | ||
2672 | #ifdef CONFIG_SBMAC_COALESCE | 2672 | #ifdef CONFIG_SBMAC_COALESCE |
2673 | __raw_writeq(((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_TX_CH0) | | 2673 | __raw_writeq(((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_TX_CH0) | |