diff options
author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-11-16 11:06:06 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:23:51 -0500 |
commit | 58a5a7b9555ea231b557ebef5cabeaf8e951df0b (patch) | |
tree | 9dac36b3483e9667a967f79982c965abd707e03d /net/decnet | |
parent | e523a1550e877f8a8ff87a50269b7ee7bfb43464 (diff) |
[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>
Diffstat (limited to 'net/decnet')
-rw-r--r-- | net/decnet/dn_nsp_in.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c index 7683d4f754d2..39a6cf7fb566 100644 --- a/net/decnet/dn_nsp_in.c +++ b/net/decnet/dn_nsp_in.c | |||
@@ -804,7 +804,7 @@ got_it: | |||
804 | goto free_out; | 804 | goto free_out; |
805 | } | 805 | } |
806 | 806 | ||
807 | return sk_receive_skb(sk, skb); | 807 | return sk_receive_skb(sk, skb, 0); |
808 | } | 808 | } |
809 | 809 | ||
810 | return dn_nsp_no_socket(skb, reason); | 810 | return dn_nsp_no_socket(skb, reason); |