lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/sfc/net_driver.h
	drivers/net/sfc/siena.c
This commit is contained in:
David S. Miller
2010-06-06 17:42:02 -07:00
parent e59d44df46 024a07bacf
commit eedc765ca4
49 changed files with 324 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv6/udp.c
View 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: