diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-06 20:42:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-06 20:42:02 -0400 |
| commit | eedc765ca4b19a41cf0b921a492ac08d640060d1 (patch) | |
| tree | 95c566c6238cc953e1e336115d2daafe8bcb388f /net/ipv6/udp.c | |
| parent | e59d44df46edaafb6b637e98d046775524b31104 (diff) | |
| parent | 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e (diff) | |
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, | |||
| 466 | if (sk->sk_state != TCP_ESTABLISHED && !np->recverr) | 466 | if (sk->sk_state != TCP_ESTABLISHED && !np->recverr) |
| 467 | goto out; | 467 | goto out; |
| 468 | 468 | ||
| 469 | if (np->recverr) { | 469 | if (np->recverr) |
| 470 | bh_lock_sock(sk); | ||
| 471 | ipv6_icmp_error(sk, skb, err, uh->dest, ntohl(info), (u8 *)(uh+1)); | 470 | ipv6_icmp_error(sk, skb, err, uh->dest, ntohl(info), (u8 *)(uh+1)); |
| 472 | bh_unlock_sock(sk); | 471 | |
| 473 | } | ||
| 474 | sk->sk_err = err; | 472 | sk->sk_err = err; |
| 475 | sk->sk_error_report(sk); | 473 | sk->sk_error_report(sk); |
| 476 | out: | 474 | out: |