From 8083d95dac43bdac4d869268eb777a7ffdf70ec9 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 25 Apr 2005 12:01:07 -0700 Subject: [PATCH] --- yaml --- r: 446 b: refs/heads/master c: b31e5b1bb53b99dfd5e890aa07e943aff114ae1c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_output.c | 2 ++ trunk/net/ipv4/netfilter/ip_conntrack_standalone.c | 7 ------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index e5693243470e..b4e9dda9c91d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f649a3bfd1b0ad8872312ed1c223d69b74406e1f +refs/heads/master: b31e5b1bb53b99dfd5e890aa07e943aff114ae1c diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c index 30ab7b6ab761..38f69532a029 100644 --- a/trunk/net/ipv4/ip_output.c +++ b/trunk/net/ipv4/ip_output.c @@ -195,6 +195,8 @@ static inline int ip_finish_output2(struct sk_buff *skb) nf_debug_ip_finish_output2(skb); #endif /*CONFIG_NETFILTER_DEBUG*/ + nf_reset(skb); + if (hh) { int hh_alen; diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_standalone.c b/trunk/net/ipv4/netfilter/ip_conntrack_standalone.c index 0c29ccf62a89..46ca45f74d85 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_standalone.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_standalone.c @@ -431,13 +431,6 @@ static unsigned int ip_conntrack_defrag(unsigned int hooknum, const struct net_device *out, int (*okfn)(struct sk_buff *)) { -#if !defined(CONFIG_IP_NF_NAT) && !defined(CONFIG_IP_NF_NAT_MODULE) - /* Previously seen (loopback)? Ignore. Do this before - fragment check. */ - if ((*pskb)->nfct) - return NF_ACCEPT; -#endif - /* Gather fragments. */ if ((*pskb)->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) { *pskb = ip_ct_gather_frags(*pskb,