diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-20 19:44:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-20 19:44:00 -0500 |
| commit | 6ab33d51713d6d60c7677c0d020910a8cb37e513 (patch) | |
| tree | 546c2ff099b2757e75cf34ddace874f1220f740e /net/ipv4/af_inet.c | |
| parent | 7be6065b39c3f1cfa796667eac1a2170465acc91 (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
include/net/mac80211.h
net/phonet/af_phonet.c
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index e3286814c8d9..b1462e8c64cf 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
| @@ -1114,6 +1114,7 @@ int inet_sk_rebuild_header(struct sock *sk) | |||
| 1114 | }, | 1114 | }, |
| 1115 | }, | 1115 | }, |
| 1116 | .proto = sk->sk_protocol, | 1116 | .proto = sk->sk_protocol, |
| 1117 | .flags = inet_sk_flowi_flags(sk), | ||
| 1117 | .uli_u = { | 1118 | .uli_u = { |
| 1118 | .ports = { | 1119 | .ports = { |
| 1119 | .sport = inet->sport, | 1120 | .sport = inet->sport, |