netfilter: xtables: compact table hook functions (2/2)

[safe/jmp/linux-2.6] / net / rxrpc / ar-input.c

diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
index ceb5d61..f98c802 100644 (file)
--- a/net/rxrpc/ar-input.c
+++ b/net/rxrpc/ar-input.c
@@ -20,6 +20,8 @@
 #include <net/sock.h>
 #include <net/af_rxrpc.h>
 #include <net/ip.h>
+#include <net/udp.h>
+#include <net/net_namespace.h>
 #include "ar-internal.h"
 
 unsigned long rxrpc_ack_timeout = 1;
@@ -168,7 +170,7 @@ static int rxrpc_fast_process_data(struct rxrpc_call *call,
        /* we may already have the packet in the out of sequence queue */
        ackbit = seq - (call->rx_data_eaten + 1);
        ASSERTCMP(ackbit, >=, 0);
-       if (__test_and_set_bit(ackbit, &call->ackr_window)) {
+       if (__test_and_set_bit(ackbit, call->ackr_window)) {
                _debug("dup oos #%u [%u,%u]",
                       seq, call->rx_data_eaten, call->rx_data_post);
                ack = RXRPC_ACK_DUPLICATE;
@@ -177,7 +179,7 @@ static int rxrpc_fast_process_data(struct rxrpc_call *call,
 
        if (seq >= call->ackr_win_top) {
                _debug("exceed #%u [%u]", seq, call->ackr_win_top);
-               __clear_bit(ackbit, &call->ackr_window);
+               __clear_bit(ackbit, call->ackr_window);
                ack = RXRPC_ACK_EXCEEDS_WINDOW;
                goto discard_and_ack;
        }
@@ -215,7 +217,7 @@ static int rxrpc_fast_process_data(struct rxrpc_call *call,
        ret = rxrpc_queue_rcv_skb(call, skb, false, terminal);
        if (ret < 0) {
                if (ret == -ENOMEM || ret == -ENOBUFS) {
-                       __clear_bit(ackbit, &call->ackr_window);
+                       __clear_bit(ackbit, call->ackr_window);
                        ack = RXRPC_ACK_NOSPACE;
                        goto discard_and_ack;
                }
@@ -594,7 +596,7 @@ dead_call:
        read_unlock_bh(&conn->lock);
 
        if (sp->hdr.flags & RXRPC_CLIENT_INITIATED &&
-           sp->hdr.seq == __constant_cpu_to_be32(1)) {
+           sp->hdr.seq == cpu_to_be32(1)) {
                _debug("incoming call");
                skb_queue_tail(&conn->trans->local->accept_queue, skb);
                rxrpc_queue_work(&conn->trans->local->acceptor);
@@ -707,10 +709,13 @@ void rxrpc_data_ready(struct sock *sk, int count)
        if (skb_checksum_complete(skb)) {
                rxrpc_free_skb(skb);
                rxrpc_put_local(local);
+               UDP_INC_STATS_BH(&init_net, UDP_MIB_INERRORS, 0);
                _leave(" [CSUM failed]");
                return;
        }
 
+       UDP_INC_STATS_BH(&init_net, UDP_MIB_INDATAGRAMS, 0);
+
        /* the socket buffer we have is owned by UDP, with UDP's data all over
         * it, but we really want our own */
        skb_orphan(skb);
@@ -770,7 +775,7 @@ cant_route_call:
        _debug("can't route call");
        if (sp->hdr.flags & RXRPC_CLIENT_INITIATED &&
            sp->hdr.type == RXRPC_PACKET_TYPE_DATA) {
-               if (sp->hdr.seq == __constant_cpu_to_be32(1)) {
+               if (sp->hdr.seq == cpu_to_be32(1)) {
                        _debug("first packet");
                        skb_queue_tail(&local->accept_queue, skb);
                        rxrpc_queue_work(&local->acceptor);