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/pasemi_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/pasemi_mac.c')
-rw-r--r-- | drivers/net/pasemi_mac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index fcbf6ccd0a85..dcd199045613 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c | |||
@@ -971,7 +971,7 @@ static irqreturn_t pasemi_mac_rx_intr(int irq, void *data) | |||
971 | if (*chan->status & PAS_STATUS_ERROR) | 971 | if (*chan->status & PAS_STATUS_ERROR) |
972 | reg |= PAS_IOB_DMA_RXCH_RESET_DINTC; | 972 | reg |= PAS_IOB_DMA_RXCH_RESET_DINTC; |
973 | 973 | ||
974 | netif_rx_schedule(dev, &mac->napi); | 974 | netif_rx_schedule(&mac->napi); |
975 | 975 | ||
976 | write_iob_reg(PAS_IOB_DMA_RXCH_RESET(chan->chno), reg); | 976 | write_iob_reg(PAS_IOB_DMA_RXCH_RESET(chan->chno), reg); |
977 | 977 | ||
@@ -1011,7 +1011,7 @@ static irqreturn_t pasemi_mac_tx_intr(int irq, void *data) | |||
1011 | 1011 | ||
1012 | mod_timer(&txring->clean_timer, jiffies + (TX_CLEAN_INTERVAL)*2); | 1012 | mod_timer(&txring->clean_timer, jiffies + (TX_CLEAN_INTERVAL)*2); |
1013 | 1013 | ||
1014 | netif_rx_schedule(mac->netdev, &mac->napi); | 1014 | netif_rx_schedule(&mac->napi); |
1015 | 1015 | ||
1016 | if (reg) | 1016 | if (reg) |
1017 | write_iob_reg(PAS_IOB_DMA_TXCH_RESET(chan->chno), reg); | 1017 | write_iob_reg(PAS_IOB_DMA_TXCH_RESET(chan->chno), reg); |
@@ -1641,7 +1641,7 @@ static int pasemi_mac_poll(struct napi_struct *napi, int budget) | |||
1641 | pkts = pasemi_mac_clean_rx(rx_ring(mac), budget); | 1641 | pkts = pasemi_mac_clean_rx(rx_ring(mac), budget); |
1642 | if (pkts < budget) { | 1642 | if (pkts < budget) { |
1643 | /* all done, no more packets present */ | 1643 | /* all done, no more packets present */ |
1644 | netif_rx_complete(dev, napi); | 1644 | netif_rx_complete(napi); |
1645 | 1645 | ||
1646 | pasemi_mac_restart_rx_intr(mac); | 1646 | pasemi_mac_restart_rx_intr(mac); |
1647 | pasemi_mac_restart_tx_intr(mac); | 1647 | pasemi_mac_restart_tx_intr(mac); |