aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/realtek/8139cp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-03-13 15:18:50 -0400
committerDavid S. Miller <davem@davemloft.net>2014-03-13 15:18:50 -0400
commitcbd84a44949748dbe37051caff2d396d256fc8b8 (patch)
tree5a97cf7f32ec371a55bcb0f5eb4f8105eb41e493 /drivers/net/ethernet/realtek/8139cp.c
parentconsolidate duplicate code is skb_checksum_setup() helpers (diff)
parent8139cp: Don't receive packets when the napi budget == 0 (diff)
downloadlinux-dev-cbd84a44949748dbe37051caff2d396d256fc8b8.tar.xz
linux-dev-cbd84a44949748dbe37051caff2d396d256fc8b8.zip
Merge branch 'napi_budget_zero'
Eric W. Biederman says: ==================== Don't receive packets when the napi budget == 0 To the best of understanding processing any received packets when the napi budget == 0 is broken driver behavior. At the same time I don't think we have ever cared before so there are a handful of drivers that need fixes. I care now as I will shortly be using htis in netpoll to get the tx queue processing without the rx queue processing. Drivers that need fixes are few and far between, and so far I have only found two of them. More similar patches later if I find more drivers that need fixes. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek/8139cp.c')
-rw-r--r--drivers/net/ethernet/realtek/8139cp.c5
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;