summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorFabio Olive Leite <fleite@redhat.com>2006-09-25 22:29:54 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-10-13 13:23:26 -0700
commit5bf91bbc9f8da83f2c7c971aeb1bc1c4c73e554c (patch)
tree905dc8ffcae9659f89e600aff46078b694f47221 /net
parent967cc8158c385ac0087ae3455e8835fa7eb94fd0 (diff)
IPV6: bh_lock_sock_nested on tcp_v6_rcv
A while ago Ingo patched tcp_v4_rcv on net/ipv4/tcp_ipv4.c to use bh_lock_sock_nested and silence a lock validator warning. This fixed it for IPv4, but recently I saw a report of the same warning on IPv6. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/tcp_ipv6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 802a1a6b1037..72c074ce4095 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1228,7 +1228,7 @@ process:
skb->dev = NULL;
- bh_lock_sock(sk);
+ bh_lock_sock_nested(sk);
ret = 0;
if (!sock_owned_by_user(sk)) {
#ifdef CONFIG_NET_DMA