diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-07-06 00:18:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-06 00:18:48 -0400 |
commit | 0283328e2360bbf3081e97f1b720dd4c4dbae111 (patch) | |
tree | d0734e59c0900b3389ddcf469950715e60f537b4 /net/rxrpc | |
parent | 629ca23c331ec75ac87b016debbb3c4d2fe62650 (diff) |
MIB: add struct net to UDP_INC_STATS_BH
Two special cases here - one is rxrpc - I put init_net there
explicitly, since we haven't touched this part yet. The second
place is in __udp4_lib_rcv - we already have a struct net there,
but I have to move its initialization above to make it ready
at the "drop" label.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc')
-rw-r--r-- | net/rxrpc/ar-input.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c index f8a699e92962..f98c8027e5c1 100644 --- a/net/rxrpc/ar-input.c +++ b/net/rxrpc/ar-input.c | |||
@@ -21,6 +21,7 @@ | |||
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 <net/udp.h> |
24 | #include <net/net_namespace.h> | ||
24 | #include "ar-internal.h" | 25 | #include "ar-internal.h" |
25 | 26 | ||
26 | unsigned long rxrpc_ack_timeout = 1; | 27 | unsigned long rxrpc_ack_timeout = 1; |
@@ -708,12 +709,12 @@ void rxrpc_data_ready(struct sock *sk, int count) | |||
708 | if (skb_checksum_complete(skb)) { | 709 | if (skb_checksum_complete(skb)) { |
709 | rxrpc_free_skb(skb); | 710 | rxrpc_free_skb(skb); |
710 | rxrpc_put_local(local); | 711 | rxrpc_put_local(local); |
711 | UDP_INC_STATS_BH(UDP_MIB_INERRORS, 0); | 712 | UDP_INC_STATS_BH(&init_net, UDP_MIB_INERRORS, 0); |
712 | _leave(" [CSUM failed]"); | 713 | _leave(" [CSUM failed]"); |
713 | return; | 714 | return; |
714 | } | 715 | } |
715 | 716 | ||
716 | UDP_INC_STATS_BH(UDP_MIB_INDATAGRAMS, 0); | 717 | UDP_INC_STATS_BH(&init_net, UDP_MIB_INDATAGRAMS, 0); |
717 | 718 | ||
718 | /* the socket buffer we have is owned by UDP, with UDP's data all over | 719 | /* the socket buffer we have is owned by UDP, with UDP's data all over |
719 | * it, but we really want our own */ | 720 | * it, but we really want our own */ |