diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-11-16 19:06:06 +0300 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 08:23:51 +0300 |
| commit | 58a5a7b9555ea231b557ebef5cabeaf8e951df0b (patch) | |
| tree | 9dac36b3483e9667a967f79982c965abd707e03d /net/decnet | |
| parent | e523a1550e877f8a8ff87a50269b7ee7bfb43464 (diff) | |
| download | linux-58a5a7b9555ea231b557ebef5cabeaf8e951df0b.tar.xz | |
[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: goto free_out; } - return sk_receive_skb(sk, skb); + return sk_receive_skb(sk, skb, 0); } return dn_nsp_no_socket(skb, reason); |