Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7309f882 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

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: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fb3477c0

net/dccp/input.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static int __dccp_rcv_established(struct sock *sk, struct sk_buff *skb, 
		goto discard;

	}



	__DCCP_INC_STATS(DCCP_MIB_INERRS);

	DCCP_INC_STATS(DCCP_MIB_INERRS);

discard:

	__kfree_skb(skb);

	return 0;

net/dccp/ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/dccp/ipv6.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

net/dccp/options.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq, 
	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);