diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-12-11 14:30:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:56:33 -0500 |
commit | 1781f7f5804e52ee2d35328b129602146a8d8254 (patch) | |
tree | dc67102f480e59d87859c50392452be4f41487bd /net/ipv4/udp.c | |
parent | 27ab2568649d5ba6c5a20212079b7c4f6da4ca0d (diff) |
[UDP]: Restore missing inDatagrams increments
The previous move of the the UDP inDatagrams counter caused the
counting of encapsulated packets, SUNRPC data (as opposed to call)
packets and RXRPC packets to go missing.
This patch restores all of these.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udp.c')
-rw-r--r-- | net/ipv4/udp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index f50de5d5218d..78cfcb4a1b3f 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -110,6 +110,7 @@ | |||
110 | */ | 110 | */ |
111 | 111 | ||
112 | DEFINE_SNMP_STAT(struct udp_mib, udp_statistics) __read_mostly; | 112 | DEFINE_SNMP_STAT(struct udp_mib, udp_statistics) __read_mostly; |
113 | EXPORT_SYMBOL(udp_statistics); | ||
113 | 114 | ||
114 | struct hlist_head udp_hash[UDP_HTABLE_SIZE]; | 115 | struct hlist_head udp_hash[UDP_HTABLE_SIZE]; |
115 | DEFINE_RWLOCK(udp_hash_lock); | 116 | DEFINE_RWLOCK(udp_hash_lock); |
@@ -969,8 +970,11 @@ int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) | |||
969 | int ret; | 970 | int ret; |
970 | 971 | ||
971 | ret = (*up->encap_rcv)(sk, skb); | 972 | ret = (*up->encap_rcv)(sk, skb); |
972 | if (ret <= 0) | 973 | if (ret <= 0) { |
974 | UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS, | ||
975 | is_udplite); | ||
973 | return -ret; | 976 | return -ret; |
977 | } | ||
974 | } | 978 | } |
975 | 979 | ||
976 | /* FALLTHROUGH -- it's a UDP Packet */ | 980 | /* FALLTHROUGH -- it's a UDP Packet */ |