diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-14 18:05:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-14 22:52:48 -0400 |
| commit | 21ceda26d7418c688dd9186eb46a49c4c0887e61 (patch) | |
| tree | e809031c38f6848d638da231e7b6539944318b09 /drivers/net/ethernet/marvell | |
| parent | cb013ea12cf71fe5ec2f7939909cec4491409724 (diff) | |
sky2: 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/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/sky2.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 5a5b23741179..d524676fdff4 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -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; |