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/tsi108_eth.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/tsi108_eth.c')
-rw-r--r-- | drivers/net/tsi108_eth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c index 271bc230c8a9..75461dbd4876 100644 --- a/drivers/net/tsi108_eth.c +++ b/drivers/net/tsi108_eth.c | |||
@@ -888,7 +888,7 @@ static int tsi108_poll(struct napi_struct *napi, int budget) | |||
888 | 888 | ||
889 | if (num_received < budget) { | 889 | if (num_received < budget) { |
890 | data->rxpending = 0; | 890 | data->rxpending = 0; |
891 | netif_rx_complete(dev, napi); | 891 | netif_rx_complete(napi); |
892 | 892 | ||
893 | TSI_WRITE(TSI108_EC_INTMASK, | 893 | TSI_WRITE(TSI108_EC_INTMASK, |
894 | TSI_READ(TSI108_EC_INTMASK) | 894 | TSI_READ(TSI108_EC_INTMASK) |
@@ -919,7 +919,7 @@ static void tsi108_rx_int(struct net_device *dev) | |||
919 | * from tsi108_check_rxring(). | 919 | * from tsi108_check_rxring(). |
920 | */ | 920 | */ |
921 | 921 | ||
922 | if (netif_rx_schedule_prep(dev, &data->napi)) { | 922 | if (netif_rx_schedule_prep(&data->napi)) { |
923 | /* Mask, rather than ack, the receive interrupts. The ack | 923 | /* Mask, rather than ack, the receive interrupts. The ack |
924 | * will happen in tsi108_poll(). | 924 | * will happen in tsi108_poll(). |
925 | */ | 925 | */ |
@@ -930,7 +930,7 @@ static void tsi108_rx_int(struct net_device *dev) | |||
930 | | TSI108_INT_RXTHRESH | | 930 | | TSI108_INT_RXTHRESH | |
931 | TSI108_INT_RXOVERRUN | TSI108_INT_RXERROR | | 931 | TSI108_INT_RXOVERRUN | TSI108_INT_RXERROR | |
932 | TSI108_INT_RXWAIT); | 932 | TSI108_INT_RXWAIT); |
933 | __netif_rx_schedule(dev, &data->napi); | 933 | __netif_rx_schedule(&data->napi); |
934 | } else { | 934 | } else { |
935 | if (!netif_running(dev)) { | 935 | if (!netif_running(dev)) { |
936 | /* This can happen if an interrupt occurs while the | 936 | /* This can happen if an interrupt occurs while the |