diff options
Diffstat (limited to 'net/ipv6/udp.c')
-rw-r--r-- | net/ipv6/udp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index d1477b350f76..a6aecf76a71b 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
@@ -379,7 +379,7 @@ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb, | |||
379 | uh->source, saddr, dif))) { | 379 | uh->source, saddr, dif))) { |
380 | struct sk_buff *buff = skb_clone(skb, GFP_ATOMIC); | 380 | struct sk_buff *buff = skb_clone(skb, GFP_ATOMIC); |
381 | if (buff) { | 381 | if (buff) { |
382 | bh_lock_sock_nested(sk2); | 382 | bh_lock_sock(sk2); |
383 | if (!sock_owned_by_user(sk2)) | 383 | if (!sock_owned_by_user(sk2)) |
384 | udpv6_queue_rcv_skb(sk2, buff); | 384 | udpv6_queue_rcv_skb(sk2, buff); |
385 | else | 385 | else |
@@ -387,7 +387,7 @@ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb, | |||
387 | bh_unlock_sock(sk2); | 387 | bh_unlock_sock(sk2); |
388 | } | 388 | } |
389 | } | 389 | } |
390 | bh_lock_sock_nested(sk); | 390 | bh_lock_sock(sk); |
391 | if (!sock_owned_by_user(sk)) | 391 | if (!sock_owned_by_user(sk)) |
392 | udpv6_queue_rcv_skb(sk, skb); | 392 | udpv6_queue_rcv_skb(sk, skb); |
393 | else | 393 | else |
@@ -508,7 +508,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct hlist_head udptable[], | |||
508 | 508 | ||
509 | /* deliver */ | 509 | /* deliver */ |
510 | 510 | ||
511 | bh_lock_sock_nested(sk); | 511 | bh_lock_sock(sk); |
512 | if (!sock_owned_by_user(sk)) | 512 | if (!sock_owned_by_user(sk)) |
513 | udpv6_queue_rcv_skb(sk, skb); | 513 | udpv6_queue_rcv_skb(sk, skb); |
514 | else | 514 | else |