diff options
author | Roland Dreier <rolandd@cisco.com> | 2005-10-24 10:55:29 -0700 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2005-10-24 10:55:29 -0700 |
commit | ec329a135974f1c400214dab02f09584d4beeba9 (patch) | |
tree | 235be754f76f4e7d51975d2434f226cfc75cdd08 /net/ipv4/ip_output.c | |
parent | bbf207860931b6a033d0fbcd170ae2332c0d8216 (diff) | |
parent | 5d7edb3c1a01310725d86f0d83fb3be45685dc82 (diff) | |
download | kernel_samsung_smdk4412-ec329a135974f1c400214dab02f09584d4beeba9.zip kernel_samsung_smdk4412-ec329a135974f1c400214dab02f09584d4beeba9.tar.gz kernel_samsung_smdk4412-ec329a135974f1c400214dab02f09584d4beeba9.tar.bz2 |
Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
Diffstat (limited to 'net/ipv4/ip_output.c')
-rw-r--r-- | net/ipv4/ip_output.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 3f1a263..1ad5202 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -391,6 +391,9 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from) to->nfct = from->nfct; nf_conntrack_get(to->nfct); to->nfctinfo = from->nfctinfo; +#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) + to->ipvs_property = from->ipvs_property; +#endif #ifdef CONFIG_BRIDGE_NETFILTER nf_bridge_put(to->nf_bridge); to->nf_bridge = from->nf_bridge; |