aboutsummaryrefslogtreecommitdiffstats
path: root/net/rxrpc
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-12-11 14:30:32 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:56:33 -0500
commit1781f7f5804e52ee2d35328b129602146a8d8254 (patch)
treedc67102f480e59d87859c50392452be4f41487bd /net/rxrpc
parent27ab2568649d5ba6c5a20212079b7c4f6da4ca0d (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/rxrpc')
-rw-r--r--net/rxrpc/ar-input.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
index 91b5bbb003e2..f446d9b9925f 100644
--- a/net/rxrpc/ar-input.c
+++ b/net/rxrpc/ar-input.c
@@ -20,6 +20,7 @@
20#include <net/sock.h> 20#include <net/sock.h>
21#include <net/af_rxrpc.h> 21#include <net/af_rxrpc.h>
22#include <net/ip.h> 22#include <net/ip.h>
23#include <net/udp.h>
23#include "ar-internal.h" 24#include "ar-internal.h"
24 25
25unsigned long rxrpc_ack_timeout = 1; 26unsigned long rxrpc_ack_timeout = 1;
@@ -707,10 +708,13 @@ void rxrpc_data_ready(struct sock *sk, int count)
707 if (skb_checksum_complete(skb)) { 708 if (skb_checksum_complete(skb)) {
708 rxrpc_free_skb(skb); 709 rxrpc_free_skb(skb);
709 rxrpc_put_local(local); 710 rxrpc_put_local(local);
711 UDP_INC_STATS_BH(UDP_MIB_INERRORS, 0);
710 _leave(" [CSUM failed]"); 712 _leave(" [CSUM failed]");
711 return; 713 return;
712 } 714 }
713 715
716 UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS, 0);
717
714 /* the socket buffer we have is owned by UDP, with UDP's data all over 718 /* the socket buffer we have is owned by UDP, with UDP's data all over
715 * it, but we really want our own */ 719 * it, but we really want our own */
716 skb_orphan(skb); 720 skb_orphan(skb);