tg3: restore rx_dropped accounting (b0057c51) · Commits · 戴 / test

commit (tg3: 64 bit stats on all arches), overlooked the rx_dropped accounting. We use a full "struct rtnl_link_stats64" to hold rx_dropped value, but forgot to report it in tg3_get_stats64(). Use an "unsigned long" instead to shrink "struct tg3" by 176 bytes, and report this value to stats readers. Increment rx_dropped counter for oversized frames. Signed-off-by:

Eric Dumazet <eric.dumazet@gmail.com> CC: Michael Chan <mchan@broadcom.com> CC: Matt Carlson <mcarlson@broadcom.com> Acked-by:

Matt Carlson <mcarlson@broadcom.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/tg3.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/net/tg3.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message