diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2014-06-26 19:06:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-02 02:10:17 +0200 |
| commit | 16f62d9bed0cdee5f9341b64cc7144869282122d (patch) | |
| tree | f3f2a9df3d3de29f89da65b6a0184b0474819b50 /drivers/net/ethernet | |
| parent | net: systemport: fix UniMAC reset logic (diff) | |
| download | linux-16f62d9bed0cdee5f9341b64cc7144869282122d.tar.xz linux-16f62d9bed0cdee5f9341b64cc7144869282122d.zip | |
net: systemport: fix TX NAPI work done return value
Although we do not limit the number of packets the TX completion
function bcm_sysport_tx_reclaim() is allowed to reclaim, we were still
using its return value as-is. This means that we could hit the WARN() in
net/core/dev.c where work_done >= budget.
Make sure we do exit the NAPI context when the TX ring is empty, and
pretend there was no work to do.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index d31f7d239064..5776e503e4c5 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -654,13 +654,13 @@ static int bcm_sysport_tx_poll(struct napi_struct *napi, int budget) work_done = bcm_sysport_tx_reclaim(ring->priv, ring); - if (work_done < budget) { + if (work_done == 0) { napi_complete(napi); /* re-enable TX interrupt */ intrl2_1_mask_clear(ring->priv, BIT(ring->index)); } - return work_done; + return 0; } static void bcm_sysport_tx_reclaim_all(struct bcm_sysport_priv *priv) |