From da4db4784a49f81fcd33e98b992714241a68ae43 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sun, 10 Oct 2010 19:55:52 +0000 Subject: [PATCH] --- yaml --- r: 211502 b: refs/heads/master c: b0057c51db66c5f0f38059f242c57d61c4741d89 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 6 ++++-- trunk/drivers/net/tg3.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fd127203fd57..16950024f776 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcf64aa379fcadd074449cbf0c049da70071b06f +refs/heads/master: b0057c51db66c5f0f38059f242c57d61c4741d89 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index bc3af78a869f..1ec4b9e0239a 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -4666,7 +4666,7 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget) desc_idx, *post_ptr); drop_it_no_recycle: /* Other statistics kept track of by card. */ - tp->net_stats.rx_dropped++; + tp->rx_dropped++; goto next_pkt; } @@ -4726,7 +4726,7 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget) if (len > (tp->dev->mtu + ETH_HLEN) && skb->protocol != htons(ETH_P_8021Q)) { dev_kfree_skb(skb); - goto next_pkt; + goto drop_it_no_recycle; } if (desc->type_flags & RXD_FLAG_VLAN && @@ -9240,6 +9240,8 @@ static struct rtnl_link_stats64 *tg3_get_stats64(struct net_device *dev, stats->rx_missed_errors = old_stats->rx_missed_errors + get_stat64(&hw_stats->rx_discards); + stats->rx_dropped = tp->rx_dropped; + return stats; } diff --git a/trunk/drivers/net/tg3.h b/trunk/drivers/net/tg3.h index 4937bd190964..be7ff138a7f9 100644 --- a/trunk/drivers/net/tg3.h +++ b/trunk/drivers/net/tg3.h @@ -2759,7 +2759,7 @@ struct tg3 { /* begin "everything else" cacheline(s) section */ - struct rtnl_link_stats64 net_stats; + unsigned long rx_dropped; struct rtnl_link_stats64 net_stats_prev; struct tg3_ethtool_stats estats; struct tg3_ethtool_stats estats_prev;