diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2014-11-12 15:40:43 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-12 22:21:33 -0500 |
| commit | 9dfa9a27b620640322588df399eb8f624b48d877 (patch) | |
| tree | b161fae973f4be8d809a830d967393fcb82e2fc5 /drivers/net/ethernet/broadcom | |
| parent | f41281d02f8b94e136f78cb1b6a5d78182c222bd (diff) | |
| download | blackbird-obmc-linux-9dfa9a27b620640322588df399eb8f624b48d877.tar.gz blackbird-obmc-linux-9dfa9a27b620640322588df399eb8f624b48d877.zip | |
net: systemport: fix tx work done in TX napi poll
With commit d75b1ade567 ("net: less interrupt masking in NAPI") napi
repoll is done only when work_done == budget. bcm_sysport_tx_poll()
always returns 0 whether or not we completed the poll quantum.
Fix this by returning either 0 when we did complete the TX ring reclaim,
or budget to trigger a repoll.
Fixes: d75b1ade567 ("net: less interrupt masking in NAPI")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index 531bb7c57531..3cb241155dac 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -731,9 +731,11 @@ static int bcm_sysport_tx_poll(struct napi_struct *napi, int budget) napi_complete(napi); /* re-enable TX interrupt */ intrl2_1_mask_clear(ring->priv, BIT(ring->index)); + + return 0; } - return 0; + return budget; } static void bcm_sysport_tx_reclaim_all(struct bcm_sysport_priv *priv) |
