diff options
| author |   Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-11-16 14:06:06 -0200 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:23:51 -0800 |
| commit | 58a5a7b9555ea231b557ebef5cabeaf8e951df0b (patch) | |
| tree | 9dac36b3483e9667a967f79982c965abd707e03d /include/net | |
| parent | [DCCP]: One NET_INC_STATS() could be NET_INC_STATS_BH in dccp_v4_err() (diff) | |
| download | linux-dev-58a5a7b9555ea231b557ebef5cabeaf8e951df0b.tar.xz linux-dev-58a5a7b9555ea231b557ebef5cabeaf8e951df0b.zip | |
[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 'include/net')
| -rw-r--r-- | include/net/sock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index dc4b92b8abea..26fc0b16bc0c 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -954,7 +954,8 @@ static inline void sock_put(struct sock *sk) sk_free(sk); } -extern int sk_receive_skb(struct sock *sk, struct sk_buff *skb); +extern int sk_receive_skb(struct sock *sk, struct sk_buff *skb, + const int nested); /* Detach socket from process context. * Announce socket dead, detach it from wait queue and inode. |