]> git.karo-electronics.de Git - linux-beck.git/commitdiff
sky2: Don't receive packets when the napi budget == 0
authorEric W. Biederman <ebiederm@xmission.com>
Sat, 15 Mar 2014 01:05:26 +0000 (18:05 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 15 Mar 2014 02:52:48 +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/marvell/sky2.c

index 5a5b23741179d585b613f0c49e7bfd1f58fb4800..d524676fdff4697627930dd03e9c2d1a822efd75 100644 (file)
@@ -2735,6 +2735,9 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx)
        unsigned int total_bytes[2] = { 0 };
        unsigned int total_packets[2] = { 0 };
 
+       if (to_do <= 0)
+               return work_done;
+
        rmb();
        do {
                struct sky2_port *sky2;