summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/amd/amd8111e.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-14 18:01:11 -0700
committerDavid S. Miller <davem@davemloft.net>2014-03-14 22:52:47 -0400
commit278d5385b148c87d3652886af3c17ea65e1f26da (patch)
tree9ca7e687769f2b1921b3198a9e2aca12978f259e /drivers/net/ethernet/amd/amd8111e.c
parentfdabfc8a74c713f4e4318715d449651f798db74a (diff)
downloadlinux-stable-278d5385b148c87d3652886af3c17ea65e1f26da.tar.gz
linux-stable-278d5385b148c87d3652886af3c17ea65e1f26da.tar.bz2
linux-stable-278d5385b148c87d3652886af3c17ea65e1f26da.zip
amd8111e: 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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd/amd8111e.c')
-rw-r--r--drivers/net/ethernet/amd/amd8111e.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 2061b471fd16..26efaaa5e73f 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -720,6 +720,9 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)
int rx_pkt_limit = budget;
unsigned long flags;
+ if (rx_pkt_limit <= 0)
+ goto rx_not_empty;
+
do{
/* process receive packets until we use the quota*/
/* If we own the next entry, it's a new packet. Send it up. */