diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-10-15 00:12:40 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-18 18:52:54 -0700 |
| commit | 8edf19c2fe028563fc6ea9cb1995b8ee4172d4b6 (patch) | |
| tree | 55c423bc7e13e99e816d95886f7d340dc1163ffa /net/ipv6 | |
| parent | c720c7e8383aff1cb219bddf474ed89d850336e3 (diff) | |
| download | op-kernel-dev-8edf19c2fe028563fc6ea9cb1995b8ee4172d4b6.zip op-kernel-dev-8edf19c2fe028563fc6ea9cb1995b8ee4172d4b6.tar.gz | |
net: sk_drops consolidation part 2
- skb_kill_datagram() can increment sk->sk_drops itself, not callers.
- UDP on IPV4 & IPV6 dropped frames (because of bad checksum or policy checks) increment sk_drops
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/raw.c | 1 | ||||
| -rw-r--r-- | net/ipv6/udp.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 52ed7d7..cb834ab 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -517,7 +517,6 @@ csum_copy_err: as some normal condition. */ err = (flags&MSG_DONTWAIT) ? -EAGAIN : -EHOSTUNREACH; - atomic_inc(&sk->sk_drops); goto out; } diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 829d300..d3b59d7 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -390,11 +390,13 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) if (rc == -ENOMEM) UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, is_udplite); - goto drop; + goto drop_no_sk_drops_inc; } return 0; drop: + atomic_inc(&sk->sk_drops); +drop_no_sk_drops_inc: UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite); kfree_skb(skb); return -1; |
