diff options
| author | Fabio Olive Leite <fleite@redhat.com> | 2006-09-26 01:28:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-28 20:53:54 -0400 |
| commit | 293b9c42511d800b5f7bb2acba50f3e584b8c410 (patch) | |
| tree | bec6ae33c1e50ed5cf03a7ecf05f5bd88636c0b8 /net | |
| parent | 2ff712585a5026a021859233fce145068292584d (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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 2546fc9f0a78..3b6575478fcc 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -1237,7 +1237,7 @@ process: | |||
| 1237 | 1237 | ||
| 1238 | skb->dev = NULL; | 1238 | skb->dev = NULL; |
| 1239 | 1239 | ||
| 1240 | bh_lock_sock(sk); | 1240 | bh_lock_sock_nested(sk); |
| 1241 | ret = 0; | 1241 | ret = 0; |
| 1242 | if (!sock_owned_by_user(sk)) { | 1242 | if (!sock_owned_by_user(sk)) { |
| 1243 | #ifdef CONFIG_NET_DMA | 1243 | #ifdef CONFIG_NET_DMA |