commit 58a5a7b9555ea231b557ebef5cabeaf8e951df0b
author Arnaldo Carvalho de Melo <acme@mandriva.com> Thu Nov 16 14:06:06 2006 -0200
committer David S. Miller <davem@sunset.davemloft.net> Sat Dec 02 21:23:51 2006 -0800
tree 9dac36b3483e9667a967f79982c965abd707e03d
parent e523a1550e877f8a8ff87a50269b7ee7bfb43464

[NET]: Conditionally use bh_lock_sock_nested in sk_receive_skb

Spotted by Ian McDonald, tentatively fixed by Gerrit Renker:

http://www.mail-archive.com/dccp%40vger.kernel.org/msg00599.html

Rewritten not to unroll sk_receive_skb, in the common case, i.e. no lock
debugging, its optimized away.

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>

net/dccp/ipv4.c

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index a20eb71..7114bef 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -899,7 +899,7 @@
 		goto discard_and_relse;
 	nf_reset(skb);
 
-	return sk_receive_skb(sk, skb);
+	return sk_receive_skb(sk, skb, 1);
 
 no_dccp_socket:
 	if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))