patch-2.3.99-pre2 linux/net/core/skbuff.c

• Lines: 26
• Date: Fri Mar 17 10:56:20 2000
• Orig file: v2.3.99-pre1/linux/net/core/skbuff.c
• Orig date: Tue Mar 7 14:32:26 2000

diff -u --recursive --new-file v2.3.99-pre1/linux/net/core/skbuff.c linux/net/core/skbuff.c
@@ -4,7 +4,7 @@
  *	Authors:	Alan Cox <iiitac@pyr.swan.ac.uk>
  *			Florian La Roche <rzsfl@rz.uni-sb.de>
  *
- *	Version:	$Id: skbuff.c,v 1.69 2000/03/06 03:47:58 davem Exp $
+ *	Version:	$Id: skbuff.c,v 1.70 2000/03/17 14:41:39 davem Exp $
  *
  *	Fixes:	
  *		Alan Cox	:	Fixed the worst of the load balancer bugs.
@@ -203,7 +203,7 @@
 	skb->dst = NULL;
 	skb->rx_dev = NULL;
 #ifdef CONFIG_NETFILTER
-	skb->nfmark = skb->nfreason = skb->nfcache = 0;
+	skb->nfmark = skb->nfcache = 0;
 	skb->nfct = NULL;
 #ifdef CONFIG_NETFILTER_DEBUG
 	skb->nf_debug = 0;
@@ -319,7 +319,6 @@
 	new->security=old->security;
 #ifdef CONFIG_NETFILTER
 	new->nfmark=old->nfmark;
-	new->nfreason=old->nfreason;
 	new->nfcache=old->nfcache;
 	new->nfct=old->nfct;
 	nf_conntrack_get(new->nfct);