diff options
| author | Andi Kleen <ak@linux.intel.com> | 2008-07-21 18:16:54 -0400 | 
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2008-07-21 18:16:54 -0400 | 
| commit | 8294fafdafc602ed11f401c44628fab8558c5cf5 (patch) | |
| tree | c8d0371cfd05226b56d52bfde9c69f8caca4501d /net/rxrpc/ar-input.c | |
| parent | 725c3a2d70f958adee807c178178819a50f68a56 (diff) | |
| parent | bf20e740a4bcc686de02e2fd1c1810a58872f46e (diff) | |
Merge branch 'for-upstream/acpi-test' of git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6 into release-2.6.27
Diffstat (limited to 'net/rxrpc/ar-input.c')
| -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 */ | 
