netfilter-2.6/patch-o-matic-ng/branches/vanilla-2.6.12.x/net/ipv4: ip_output.c netfilter/ip_conntrac...

[pluto]

Author: pluto
Date: Wed Jul 27 16:31:29 2005
New Revision: 6230

Modified:
   netfilter-2.6/patch-o-matic-ng/branches/vanilla-2.6.12.x/net/ipv4/ip_output.c
   netfilter-2.6/patch-o-matic-ng/branches/vanilla-2.6.12.x/net/ipv4/netfilter/ip_conntrack_standalone.c
Log:
- synced with 2.6.12.3.


Modified: netfilter-2.6/patch-o-matic-ng/branches/vanilla-2.6.12.x/net/ipv4/ip_output.c
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/branches/vanilla-2.6.12.x/net/ipv4/ip_output.c	(original)
+++ netfilter-2.6/patch-o-matic-ng/branches/vanilla-2.6.12.x/net/ipv4/ip_output.c	Wed Jul 27 16:31:29 2005
@@ -111,7 +111,6 @@
 #ifdef CONFIG_NETFILTER_DEBUG
 	nf_debug_ip_loopback_xmit(newskb);
 #endif
-	nf_reset(newskb);
 	netif_rx(newskb);
 	return 0;
 }
@@ -196,8 +195,6 @@
 	nf_debug_ip_finish_output2(skb);
 #endif /*CONFIG_NETFILTER_DEBUG*/
 
-	nf_reset(skb);
-
 	if (hh) {
 		int hh_alen;
 

Modified: netfilter-2.6/patch-o-matic-ng/branches/vanilla-2.6.12.x/net/ipv4/netfilter/ip_conntrack_standalone.c
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/branches/vanilla-2.6.12.x/net/ipv4/netfilter/ip_conntrack_standalone.c	(original)
+++ netfilter-2.6/patch-o-matic-ng/branches/vanilla-2.6.12.x/net/ipv4/netfilter/ip_conntrack_standalone.c	Wed Jul 27 16:31:29 2005
@@ -432,6 +432,13 @@
 				        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,