From dbfa825376f29dfaab83b1b37b2589e5bf3dc9d1 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 14 May 2007 12:38:12 -0700 Subject: [PATCH] --- yaml --- r: 56543 b: refs/heads/master c: 3225b919036a3ec2e96bb36b7a4fd64c43fdbe84 h: refs/heads/master i: 56541: ffe83e78c4cf97103d1e320a81f0409768ab40b6 56539: ece03db86316289aaed1383bff9e492cb7ef17ef 56535: 8e07c4b04fffa38f99c6179566c4fdc724ad8822 56527: 78434bd94ca3a5bcb63b5a80a3c65d9bda766f5e 56511: 6169015c2801e8b9c32c274e37a1a02c547cd785 v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index efbdffa12b1b..a8c283e200a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53419c68517ee296f737cdc0acaca6eb1ae23aeb +refs/heads/master: 3225b919036a3ec2e96bb36b7a4fd64c43fdbe84 diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index 887c1cea1b42..bde28ad9797d 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -2141,8 +2141,10 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do) switch (le->opcode & ~HW_OWNER) { case OP_RXSTAT: skb = sky2_receive(dev, length, status); - if (!skb) + if (unlikely(!skb)) { + sky2->net_stats.rx_dropped++; goto force_update; + } skb->protocol = eth_type_trans(skb, dev); sky2->net_stats.rx_packets++;