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/ixgbe/ixgbe_main.c
	include/net/mac80211.h
	net/phonet/af_phonet.c
This commit is contained in:
David S. Miller
2008-11-20 16:44:00 -08:00
parent 7be6065b39 13d428afc0
commit 6ab33d5171
120 changed files with 782 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/ipv4/af_inet.c
View File

@@ -1114,6 +1114,7 @@ int inet_sk_rebuild_header(struct sock *sk)
},
},
.proto = sk->sk_protocol,
.flags = inet_sk_flowi_flags(sk),
.uli_u = {
.ports = {
.sport = inet->sport,