diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-21 01:44:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-21 01:44:00 +0100 |
| commit | 6ab33d51713d6d60c7677c0d020910a8cb37e513 (patch) | |
| tree | 546c2ff099b2757e75cf34ddace874f1220f740e /net/ipv4/af_inet.c | |
| parent | netdevice wanrouter: Convert directly reference of netdev->priv (diff) | |
| parent | Linux 2.6.28-rc6 (diff) | |
| download | linux-6ab33d51713d6d60c7677c0d020910a8cb37e513.tar.xz linux-6ab33d51713d6d60c7677c0d020910a8cb37e513.zip | |
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) }, }, .proto = sk->sk_protocol, + .flags = inet_sk_flowi_flags(sk), .uli_u = { .ports = { .sport = inet->sport, |