diff options
| author | David S. Miller | 2010-05-31 00:10:35 -0700 |
|---|---|---|
| committer | David S. Miller | 2010-05-31 00:10:35 -0700 |
| commit | 92b4522f72916ff2675060e29e4b24cf26ab59ce (patch) | |
| tree | 8424a1c550a98ce09f127425fde9b7b5f2f5027a /net/ipv4 | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
| parent | 2903037400a26e7c0cc93ab75a7d62abfacdf485 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/udp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 58585748bdac..50678f9a2763 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -634,7 +634,9 @@ void __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable) if (!harderr || sk->sk_state != TCP_ESTABLISHED) goto out; } else { + bh_lock_sock(sk); ip_icmp_error(sk, skb, err, uh->dest, info, (u8 *)(uh+1)); + bh_unlock_sock(sk); } sk->sk_err = err; sk->sk_error_report(sk); |