diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2010-02-03 03:31:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-03 23:32:29 -0500 |
commit | 90c30335a70e96b8b8493b7deb15e6b30e6d9fce (patch) | |
tree | 1d1f71bb8bba8c0e0d07f9fb80e5167aefcc2d3b /drivers/net/sky2.c | |
parent | 3fbd9187d004149fb8a98c9cb51ef9f4a4f66aca (diff) |
sky2: Flow control frames recorded as dropped packets
Thanks for your patch. A more general solution would be to move the
rx_dropped up into sky2_receive.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r-- | drivers/net/sky2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 72c92495a9b3..744362272e2d 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -2404,6 +2404,9 @@ okay: | |||
2404 | skb = receive_copy(sky2, re, length); | 2404 | skb = receive_copy(sky2, re, length); |
2405 | else | 2405 | else |
2406 | skb = receive_new(sky2, re, length); | 2406 | skb = receive_new(sky2, re, length); |
2407 | |||
2408 | dev->stats.rx_dropped += (skb == NULL); | ||
2409 | |||
2407 | resubmit: | 2410 | resubmit: |
2408 | sky2_rx_submit(sky2, re); | 2411 | sky2_rx_submit(sky2, re); |
2409 | 2412 | ||
@@ -2515,11 +2518,10 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx) | |||
2515 | case OP_RXSTAT: | 2518 | case OP_RXSTAT: |
2516 | total_packets[port]++; | 2519 | total_packets[port]++; |
2517 | total_bytes[port] += length; | 2520 | total_bytes[port] += length; |
2521 | |||
2518 | skb = sky2_receive(dev, length, status); | 2522 | skb = sky2_receive(dev, length, status); |
2519 | if (unlikely(!skb)) { | 2523 | if (!skb) |
2520 | dev->stats.rx_dropped++; | ||
2521 | break; | 2524 | break; |
2522 | } | ||
2523 | 2525 | ||
2524 | /* This chip reports checksum status differently */ | 2526 | /* This chip reports checksum status differently */ |
2525 | if (hw->flags & SKY2_HW_NEW_LE) { | 2527 | if (hw->flags & SKY2_HW_NEW_LE) { |