diff options
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r-- | net/ipv6/ip6_output.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 0f4434eff66a..49523c2a9f10 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
@@ -504,23 +504,7 @@ static void ip6_copy_metadata(struct sk_buff *to, struct sk_buff *from) | |||
504 | #ifdef CONFIG_NET_SCHED | 504 | #ifdef CONFIG_NET_SCHED |
505 | to->tc_index = from->tc_index; | 505 | to->tc_index = from->tc_index; |
506 | #endif | 506 | #endif |
507 | #ifdef CONFIG_NETFILTER | 507 | nf_copy(to, from); |
508 | /* Connection association is same as pre-frag packet */ | ||
509 | nf_conntrack_put(to->nfct); | ||
510 | to->nfct = from->nfct; | ||
511 | nf_conntrack_get(to->nfct); | ||
512 | to->nfctinfo = from->nfctinfo; | ||
513 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | ||
514 | nf_conntrack_put_reasm(to->nfct_reasm); | ||
515 | to->nfct_reasm = from->nfct_reasm; | ||
516 | nf_conntrack_get_reasm(to->nfct_reasm); | ||
517 | #endif | ||
518 | #ifdef CONFIG_BRIDGE_NETFILTER | ||
519 | nf_bridge_put(to->nf_bridge); | ||
520 | to->nf_bridge = from->nf_bridge; | ||
521 | nf_bridge_get(to->nf_bridge); | ||
522 | #endif | ||
523 | #endif | ||
524 | skb_copy_secmark(to, from); | 508 | skb_copy_secmark(to, from); |
525 | } | 509 | } |
526 | 510 | ||