Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6.git] / net / ipv6 / udp.c
index 4aea57d..1dd1aff 100644 (file)
@@ -466,11 +466,9 @@ void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
        if (sk->sk_state != TCP_ESTABLISHED && !np->recverr)
                goto out;
 
-       if (np->recverr) {
-               bh_lock_sock(sk);
+       if (np->recverr)
                ipv6_icmp_error(sk, skb, err, uh->dest, ntohl(info), (u8 *)(uh+1));
-               bh_unlock_sock(sk);
-       }
+
        sk->sk_err = err;
        sk->sk_error_report(sk);
 out: