diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-09-30 17:06:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-05 17:47:55 -0400 |
commit | caf586e5f23cebb2a68cbaf288d59dbbf2d74052 (patch) | |
tree | 5c0dfcf5a14c55501f9225835c83abddb8d1876e /net/ipv4 | |
parent | a00eac0c459abecb539fb2a2abd3122dd7ca5d4a (diff) |
net: add a core netdev->rx_dropped counter
In various situations, a device provides a packet to our stack and we
drop it before it enters protocol stack :
- softnet backlog full (accounted in /proc/net/softnet_stat)
- bad vlan tag (not accounted)
- unknown/unregistered protocol (not accounted)
We can handle a per-device counter of such dropped frames at core level,
and automatically adds it to the device provided stats (rx_dropped), so
that standard tools can be used (ifconfig, ip link, cat /proc/net/dev)
This is a generalization of commit 8990f468a (net: rx_dropped
accounting), thus reverting it.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/ip_gre.c | 3 | ||||
-rw-r--r-- | net/ipv4/ipip.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index fbe2c473a06a..9d421f4cf3ef 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
@@ -679,8 +679,7 @@ static int ipgre_rcv(struct sk_buff *skb) | |||
679 | skb_reset_network_header(skb); | 679 | skb_reset_network_header(skb); |
680 | ipgre_ecn_decapsulate(iph, skb); | 680 | ipgre_ecn_decapsulate(iph, skb); |
681 | 681 | ||
682 | if (netif_rx(skb) == NET_RX_DROP) | 682 | netif_rx(skb); |
683 | tunnel->dev->stats.rx_dropped++; | ||
684 | 683 | ||
685 | rcu_read_unlock(); | 684 | rcu_read_unlock(); |
686 | return 0; | 685 | return 0; |
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 6ad46c28ede2..e9b816e6cd73 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
@@ -414,8 +414,7 @@ static int ipip_rcv(struct sk_buff *skb) | |||
414 | 414 | ||
415 | ipip_ecn_decapsulate(iph, skb); | 415 | ipip_ecn_decapsulate(iph, skb); |
416 | 416 | ||
417 | if (netif_rx(skb) == NET_RX_DROP) | 417 | netif_rx(skb); |
418 | tunnel->dev->stats.rx_dropped++; | ||
419 | 418 | ||
420 | rcu_read_unlock(); | 419 | rcu_read_unlock(); |
421 | return 0; | 420 | return 0; |