summaryrefslogtreecommitdiff
path: root/net/ipv6/ip6mr.c
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-10-01 01:06:55 +0400
committerDavid S. Miller <davem@davemloft.net>2010-10-06 01:47:55 +0400
commitcaf586e5f23cebb2a68cbaf288d59dbbf2d74052 (patch)
tree5c0dfcf5a14c55501f9225835c83abddb8d1876e /net/ipv6/ip6mr.c
parenta00eac0c459abecb539fb2a2abd3122dd7ca5d4a (diff)
downloadlinux-caf586e5f23cebb2a68cbaf288d59dbbf2d74052.tar.xz
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/ipv6/ip6mr.c')
-rw-r--r--net/ipv6/ip6mr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 2640c9be589d..6f32ffce7022 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -666,8 +666,7 @@ static int pim6_rcv(struct sk_buff *skb)
skb_tunnel_rx(skb, reg_dev);
- if (netif_rx(skb) == NET_RX_DROP)
- reg_dev->stats.rx_dropped++;
+ netif_rx(skb);
dev_put(reg_dev);
return 0;