From: Fabio Olive Leite <fleite@redhat.com>
Date: Tue, 26 Sep 2006 05:28:47 +0000 (-0700)
Subject: [IPV6]: bh_lock_sock_nested on tcp_v6_rcv
X-Git-Tag: v2.6.19-rc1~858^2~159
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=293b9c42511d800b5f7bb2acba50f3e584b8c410;p=linux-2.6

[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>
---

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 2546fc9f0a..3b6575478f 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1237,7 +1237,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