]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
bnx2x: Don't receive packets when the napi budget == 0
authorEric W. Biederman <ebiederm@xmission.com>
Sat, 15 Mar 2014 00:57:59 +0000 (17:57 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 15 Mar 2014 02:52:47 +0000 (22:52 -0400)
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>
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

index 117b5c7f8ac9a1251cb94c163c150afbb2cbb204..acd494647f2584f1c1b2f648c13ec0d14fa2f530 100644 (file)
@@ -872,6 +872,8 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
        if (unlikely(bp->panic))
                return 0;
 #endif
+       if (budget <= 0)
+               return rx_pkt;
 
        bd_cons = fp->rx_bd_cons;
        bd_prod = fp->rx_bd_prod;