---

yaml --- r: 256135 b: refs/heads/master c: 81b16ba h: refs/heads/master i: 256133: 36dcaee 256131: 5089e21 256127: 1707a06 v: v3
git-mirror · Jul 6, 2011 · f3b58a5 · f3b58a5
1 parent 5418791
commit f3b58a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3600cdadb7ab9ee5f4e73ed01242c3e8b8e3282c
+refs/heads/master: 81b16ba2f1cc93a1ee1dda48be2ea2d91a0cb72e
diff --git a/trunk/drivers/net/veth.c b/trunk/drivers/net/veth.c
@@ -30,7 +30,6 @@ struct veth_net_stats {
 	u64			rx_bytes;
 	u64			tx_bytes;
 	u64			rx_dropped;
-	u64			tx_dropped;
 	struct u64_stats_sync	syncp;
 };
 
@@ -168,7 +167,7 @@ static struct rtnl_link_stats64 *veth_get_stats64(struct net_device *dev,
 	for_each_possible_cpu(cpu) {
 		struct veth_net_stats *stats = per_cpu_ptr(priv->stats, cpu);
 		u64 rx_packets, rx_bytes, rx_dropped;
-		u64 tx_packets, tx_bytes, tx_dropped;
+		u64 tx_packets, tx_bytes;
 		unsigned int start;
 
 		do {
@@ -178,14 +177,12 @@ static struct rtnl_link_stats64 *veth_get_stats64(struct net_device *dev,
 			rx_bytes = stats->rx_bytes;
 			tx_bytes = stats->tx_bytes;
 			rx_dropped = stats->rx_dropped;
-			tx_dropped = stats->tx_dropped;
 		} while (u64_stats_fetch_retry_bh(&stats->syncp, start));
 		tot->rx_packets += rx_packets;
 		tot->tx_packets += tx_packets;
 		tot->rx_bytes   += rx_bytes;
 		tot->tx_bytes   += tx_bytes;
 		tot->rx_dropped += rx_dropped;
-		tot->tx_dropped += tx_dropped;
 	}
 
 	return tot;