[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1309940240.2292.7.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC>
Date: Wed, 06 Jul 2011 10:17:20 +0200
From: Eric Dumazet <eric.dumazet@...il.com>
To: David Miller <davem@...emloft.net>
Cc: netdev@...r.kernel.org
Subject: [PATCH net-next-2.6] veth: Kill unused tx_dropped
Le mardi 05 juillet 2011 à 23:49 -0700, David Miller a écrit :
> -tx_drop:
> - kfree_skb(skb);
> - u64_stats_update_begin(&stats->syncp);
> - stats->tx_dropped++;
> - u64_stats_update_end(&stats->syncp);
> - return NETDEV_TX_OK;
> -
> rx_drop:
> u64_stats_update_begin(&rcv_stats->syncp);
> rcv_stats->rx_dropped++;
Then we should also kill tx_dropped from percpu stats ?
Here is a patch on top of yours
[PATCH] veth: Kill unused tx_dropped
Followup to commit f82528bc13a (Exclude duplicated checking for
iface-up) : We no longer need percpu tx_dropped field.
Signed-off-by: Eric Dumazet <eric.dumazet@...il.com>
---
drivers/net/veth.c | 5 +----
1 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 19e0b0c..7f78db7 100644
--- a/drivers/net/veth.c
+++ b/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;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists