aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/microchip/lan743x_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/microchip/lan743x_main.c')
-rw-r--r--drivers/net/ethernet/microchip/lan743x_main.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
index 867cddba840f..e8ca98c070f6 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c
@@ -1672,7 +1672,7 @@ static int lan743x_tx_napi_poll(struct napi_struct *napi, int weight)
1672 netif_wake_queue(adapter->netdev); 1672 netif_wake_queue(adapter->netdev);
1673 } 1673 }
1674 1674
1675 if (!napi_complete_done(napi, weight)) 1675 if (!napi_complete(napi))
1676 goto done; 1676 goto done;
1677 1677
1678 /* enable isr */ 1678 /* enable isr */
@@ -1681,7 +1681,7 @@ static int lan743x_tx_napi_poll(struct napi_struct *napi, int weight)
1681 lan743x_csr_read(adapter, INT_STS); 1681 lan743x_csr_read(adapter, INT_STS);
1682 1682
1683done: 1683done:
1684 return weight; 1684 return 0;
1685} 1685}
1686 1686
1687static void lan743x_tx_ring_cleanup(struct lan743x_tx *tx) 1687static void lan743x_tx_ring_cleanup(struct lan743x_tx *tx)
@@ -1870,9 +1870,9 @@ static int lan743x_tx_open(struct lan743x_tx *tx)
1870 tx->vector_flags = lan743x_intr_get_vector_flags(adapter, 1870 tx->vector_flags = lan743x_intr_get_vector_flags(adapter,
1871 INT_BIT_DMA_TX_ 1871 INT_BIT_DMA_TX_
1872 (tx->channel_number)); 1872 (tx->channel_number));
1873 netif_napi_add(adapter->netdev, 1873 netif_tx_napi_add(adapter->netdev,
1874 &tx->napi, lan743x_tx_napi_poll, 1874 &tx->napi, lan743x_tx_napi_poll,
1875 tx->ring_size - 1); 1875 tx->ring_size - 1);
1876 napi_enable(&tx->napi); 1876 napi_enable(&tx->napi);
1877 1877
1878 data = 0; 1878 data = 0;
@@ -3017,6 +3017,7 @@ static const struct dev_pm_ops lan743x_pm_ops = {
3017 3017
3018static const struct pci_device_id lan743x_pcidev_tbl[] = { 3018static const struct pci_device_id lan743x_pcidev_tbl[] = {
3019 { PCI_DEVICE(PCI_VENDOR_ID_SMSC, PCI_DEVICE_ID_SMSC_LAN7430) }, 3019 { PCI_DEVICE(PCI_VENDOR_ID_SMSC, PCI_DEVICE_ID_SMSC_LAN7430) },
3020 { PCI_DEVICE(PCI_VENDOR_ID_SMSC, PCI_DEVICE_ID_SMSC_LAN7431) },
3020 { 0, } 3021 { 0, }
3021}; 3022};
3022 3023