Commit cc592205 authored by Bryan Whitehead's avatar Bryan Whitehead Committed by David S. Miller

lan743x: fix return value for lan743x_tx_napi_poll

The lan743x driver, when under heavy traffic load, has been noticed
to sometimes hang, or cause a kernel panic.

Debugging reveals that the TX napi poll routine was returning
the wrong value, 'weight'. Most other drivers return 0.
And call napi_complete, instead of napi_complete_done.

Additionally when creating the tx napi poll routine.
Changed netif_napi_add, to netif_tx_napi_add.

Updates for v3:
    changed 'fixes' tag to match defined format

Updates for v2:
use napi_complete, instead of napi_complete_done in
    lan743x_tx_napi_poll
use netif_tx_napi_add, instead of netif_napi_add for
    registration of tx napi poll routine

fixes: 23f0703c ("lan743x: Add main source files for new lan743x driver")
Signed-off-by: default avatarBryan Whitehead <Bryan.Whitehead@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b5adba0
...@@ -1672,7 +1672,7 @@ static int lan743x_tx_napi_poll(struct napi_struct *napi, int weight) ...@@ -1672,7 +1672,7 @@ static int lan743x_tx_napi_poll(struct napi_struct *napi, int weight)
netif_wake_queue(adapter->netdev); netif_wake_queue(adapter->netdev);
} }
if (!napi_complete_done(napi, weight)) if (!napi_complete(napi))
goto done; goto done;
/* enable isr */ /* enable isr */
...@@ -1681,7 +1681,7 @@ static int lan743x_tx_napi_poll(struct napi_struct *napi, int weight) ...@@ -1681,7 +1681,7 @@ static int lan743x_tx_napi_poll(struct napi_struct *napi, int weight)
lan743x_csr_read(adapter, INT_STS); lan743x_csr_read(adapter, INT_STS);
done: done:
return weight; return 0;
} }
static void lan743x_tx_ring_cleanup(struct lan743x_tx *tx) static void lan743x_tx_ring_cleanup(struct lan743x_tx *tx)
...@@ -1870,9 +1870,9 @@ static int lan743x_tx_open(struct lan743x_tx *tx) ...@@ -1870,9 +1870,9 @@ static int lan743x_tx_open(struct lan743x_tx *tx)
tx->vector_flags = lan743x_intr_get_vector_flags(adapter, tx->vector_flags = lan743x_intr_get_vector_flags(adapter,
INT_BIT_DMA_TX_ INT_BIT_DMA_TX_
(tx->channel_number)); (tx->channel_number));
netif_napi_add(adapter->netdev, netif_tx_napi_add(adapter->netdev,
&tx->napi, lan743x_tx_napi_poll, &tx->napi, lan743x_tx_napi_poll,
tx->ring_size - 1); tx->ring_size - 1);
napi_enable(&tx->napi); napi_enable(&tx->napi);
data = 0; data = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment