summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-14 18:10:14 -0700
committerDavid S. Miller <davem@davemloft.net>2014-03-14 22:52:48 -0400
commit176f792f571ffef6d86b4254424cc05bb3874c9e (patch)
treebd3e5e3706745ae6d6521fbbd0d3d434ad36e0c7 /drivers
parentd1def91cd7fcc82ac0bea9a46b5e31a7a005ecb6 (diff)
downloadlinux-176f792f571ffef6d86b4254424cc05bb3874c9e.tar.bz2
tc35815: 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')
-rw-r--r--drivers/net/ethernet/toshiba/tc35815.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c
index 88e9c73cebc0..fef5573dbfca 100644
--- a/drivers/net/ethernet/toshiba/tc35815.c
+++ b/drivers/net/ethernet/toshiba/tc35815.c
@@ -1645,6 +1645,9 @@ static int tc35815_poll(struct napi_struct *napi, int budget)
int received = 0, handled;
u32 status;
+ if (budget <= 0)
+ return received;
+
spin_lock(&lp->rx_lock);
status = tc_readl(&tr->Int_Src);
do {