diff options
author | Robert Stonehouse <rstonehouse@solarflare.com> | 2019-02-14 18:27:43 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-02-14 18:47:16 +0100 |
commit | 50f444aa50a4f3fab35a04f56d6bb83dc1e8c875 (patch) | |
tree | 327e50657842ed8c78f5629c23e1c4fd445f9cf9 /drivers/net/ethernet/sfc/rx.c | |
parent | net: adaptec: starfire: replace dev_kfree_skb_irq by dev_consume_skb_irq for ... (diff) | |
download | linux-50f444aa50a4f3fab35a04f56d6bb83dc1e8c875.tar.xz linux-50f444aa50a4f3fab35a04f56d6bb83dc1e8c875.zip |
sfc: ensure recovery after allocation failures
After failing to allocate a receive buffer the driver may fail to ever
request additional allocations. EF10 NICs require new receive buffers to
be pushed in batches of eight or more. The test for whether a slow fill
should be scheduled failed to take account of this. There is little
downside to *always* requesting a slow fill if we failed to allocate a
buffer, so the condition has been removed completely. The timer that
triggers the request for a refill has also been shortened.
Signed-off-by: Robert Stonehouse <rstonehouse@solarflare.com>
Signed-off-by: Bert Kenward <bkenward@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/rx.c')
-rw-r--r-- | drivers/net/ethernet/sfc/rx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c index 396ff01298cd..8702ab44d80b 100644 --- a/drivers/net/ethernet/sfc/rx.c +++ b/drivers/net/ethernet/sfc/rx.c @@ -360,8 +360,7 @@ void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue, bool atomic) rc = efx_init_rx_buffers(rx_queue, atomic); if (unlikely(rc)) { /* Ensure that we don't leave the rx queue empty */ - if (rx_queue->added_count == rx_queue->removed_count) - efx_schedule_slow_fill(rx_queue); + efx_schedule_slow_fill(rx_queue); goto out; } } while ((space -= batch_size) >= batch_size); |