dccp: do not assume DCCP code is non preemptible

DCCP uses the generic backlog code, and this will soon
be changed to not disable BH when protocol is called back.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dccp/input.c b/net/dccp/input.c
index 2437ecc13b82fb83f13f5280391d2d64470a471d..ba347184bda9b3fee1f86db847352ab133ddaa3f 100644 (file)
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -359,7 +359,7 @@ send_sync:
                goto discard;
        }
 
-       __DCCP_INC_STATS(DCCP_MIB_INERRS);
+       DCCP_INC_STATS(DCCP_MIB_INERRS);
 discard:
        __kfree_skb(skb);
        return 0;

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index a8164272e0f43ea2affef82603b6864fdef40235..5c7e413a3ae407e67565b48a8bd6f43e3b02de4d 100644 (file)
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -533,8 +533,8 @@ static void dccp_v4_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb)
        bh_unlock_sock(ctl_sk);
 
        if (net_xmit_eval(err) == 0) {
-               __DCCP_INC_STATS(DCCP_MIB_OUTSEGS);
-               __DCCP_INC_STATS(DCCP_MIB_OUTRSTS);
+               DCCP_INC_STATS(DCCP_MIB_OUTSEGS);
+               DCCP_INC_STATS(DCCP_MIB_OUTRSTS);
        }
 out:
         dst_release(dst);

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 0f4eb4ea57a5fb5412a8557023939e89a80e9b98..d176f4e66369a399f5fe8a440eb864dbac9c7542 100644 (file)
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -277,8 +277,8 @@ static void dccp_v6_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb)
        if (!IS_ERR(dst)) {
                skb_dst_set(skb, dst);
                ip6_xmit(ctl_sk, skb, &fl6, NULL, 0);
-               __DCCP_INC_STATS(DCCP_MIB_OUTSEGS);
-               __DCCP_INC_STATS(DCCP_MIB_OUTRSTS);
+               DCCP_INC_STATS(DCCP_MIB_OUTSEGS);
+               DCCP_INC_STATS(DCCP_MIB_OUTRSTS);
                return;
        }
 

diff --git a/net/dccp/options.c b/net/dccp/options.c
index b82b7ee9a1d2dce6ab583a673e59a998c67d871f..74d29c56c36709fd4e31f0e63a1f8b1aa38a32cd 100644 (file)
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
@@ -253,7 +253,7 @@ out_nonsensical_length:
        return 0;
 
 out_invalid_option:
-       __DCCP_INC_STATS(DCCP_MIB_INVALIDOPT);
+       DCCP_INC_STATS(DCCP_MIB_INVALIDOPT);
        rc = DCCP_RESET_CODE_OPTION_ERROR;
 out_featneg_failed:
        DCCP_WARN("DCCP(%p): Option %d (len=%d) error=%u\n", sk, opt, len, rc);