diff options
author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-11-16 16:06:06 (GMT) |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 05:23:51 (GMT) |
commit | 58a5a7b9555ea231b557ebef5cabeaf8e951df0b (patch) | |
tree | 9dac36b3483e9667a967f79982c965abd707e03d /drivers/net/pppoe.c | |
parent | e523a1550e877f8a8ff87a50269b7ee7bfb43464 (diff) | |
download | linux-fsl-qoriq-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 'drivers/net/pppoe.c')
-rw-r--r-- | drivers/net/pppoe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index 0adee73..315d5c3 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c @@ -393,7 +393,7 @@ static int pppoe_rcv(struct sk_buff *skb, po = get_item((unsigned long) ph->sid, eth_hdr(skb)->h_source); if (po != NULL) - return sk_receive_skb(sk_pppox(po), skb); + return sk_receive_skb(sk_pppox(po), skb, 0); drop: kfree_skb(skb); out: |