diff options
Diffstat (limited to 'drivers/net/tsi108_eth.c')
-rw-r--r-- | drivers/net/tsi108_eth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c index 75461dbd4876..1138782e5611 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(napi); | 891 | napi_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) |
@@ -915,11 +915,11 @@ static void tsi108_rx_int(struct net_device *dev) | |||
915 | * | 915 | * |
916 | * This can happen if this code races with tsi108_poll(), which masks | 916 | * This can happen if this code races with tsi108_poll(), which masks |
917 | * the interrupts after tsi108_irq_one() read the mask, but before | 917 | * the interrupts after tsi108_irq_one() read the mask, but before |
918 | * netif_rx_schedule is called. It could also happen due to calls | 918 | * napi_schedule is called. It could also happen due to calls |
919 | * from tsi108_check_rxring(). | 919 | * from tsi108_check_rxring(). |
920 | */ | 920 | */ |
921 | 921 | ||
922 | if (netif_rx_schedule_prep(&data->napi)) { | 922 | if (napi_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(&data->napi); | 933 | __napi_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 |