diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-11 14:31:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-13 15:18:45 -0400 |
| commit | 50ff44be401b4d78388024b3e425e979904f304e (patch) | |
| tree | 5a97cf7f32ec371a55bcb0f5eb4f8105eb41e493 /drivers/net/ethernet/realtek | |
| parent | 310c4d4e23d191156810f402c747e5e17c4dc0b1 (diff) | |
| download | blackbird-op-linux-50ff44be401b4d78388024b3e425e979904f304e.tar.gz blackbird-op-linux-50ff44be401b4d78388024b3e425e979904f304e.zip | |
8139cp: Don't receive packets when the napi budget == 0
Processing any incoming packets with a with a napi budget of 0
is incorrect driver behavior.
This matters as netpoll will shortly call drivers with a budget of 0
to avoid receive packet processing happening in hard irq context.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/8139cp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c index a3c1daa7ad5c..2bc728e65e24 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -476,7 +476,7 @@ rx_status_loop: rx = 0; cpw16(IntrStatus, cp_rx_intr_mask); - while (1) { + while (rx < budget) { u32 status, len; dma_addr_t mapping, new_mapping; struct sk_buff *skb, *new_skb; @@ -554,9 +554,6 @@ rx_next: else desc->opts1 = cpu_to_le32(DescOwn | cp->rx_buf_sz); rx_tail = NEXT_RX(rx_tail); - - if (rx >= budget) - break; } cp->rx_tail = rx_tail; |
