diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-07 02:42:02 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-07 02:42:02 +0200 |
| commit | eedc765ca4b19a41cf0b921a492ac08d640060d1 (patch) | |
| tree | 95c566c6238cc953e1e336115d2daafe8bcb388f /net/ipv6/udp.c | |
| parent | ixgbevf: Enable GRO by default (diff) | |
| parent | r8169: fix random mdio_write failures (diff) | |
| download | linux-eedc765ca4b19a41cf0b921a492ac08d640060d1.tar.xz linux-eedc765ca4b19a41cf0b921a492ac08d640060d1.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/net_driver.h
drivers/net/sfc/siena.c
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 4aea57dec75f..1dd1affdead2 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -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: |