patch-2.3.15 linux/net/ipv4/ip_fragment.c

Next file: linux/net/ipv4/ip_fw.c
Previous file: linux/net/ipv4/ip_forward.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.14/linux/net/ipv4/ip_fragment.c linux/net/ipv4/ip_fragment.c
@@ -5,7 +5,7 @@
  *
  *		The IP fragmentation functionality.
  *		
- * Version:	$Id: ip_fragment.c,v 1.42 1999/06/12 13:11:34 davem Exp $
+ * Version:	$Id: ip_fragment.c,v 1.44 1999/08/20 11:05:19 davem Exp $
  *
  * Authors:	Fred N. van Kempen <waltje@uWalt.NL.Mugnet.ORG>
  *		Alan Cox <Alan.Cox@linux.org>
@@ -20,6 +20,7 @@
  *		John McDonald	:	0 length frag bug.
  */
 
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
@@ -33,8 +34,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/inet.h>
-#include <linux/firewall.h>
-#include <linux/ip_fw.h>
+#include <linux/netfilter_ipv4.h>
 
 /* Fragment cache limits. We will commit 256K at one time. Should we
  * cross that limit we will prune down to 192K. This should cope with
@@ -386,6 +386,10 @@
 	*	--rct
 	*/
 	skb->security = qp->fragments->skb->security;
+
+#ifdef CONFIG_NETFILTER_DEBUG
+	skb->nf_debug = qp->fragments->skb->nf_debug;
+#endif
 
 	/* Done with all fragments. Fixup the new IP header. */
 	iph = skb->nh.iph;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)