patch-2.4.6 linux/net/ipv4/ip_output.c

• Lines: 26
• Date: Mon Jun 11 19:15:27 2001
• Orig file: v2.4.5/linux/net/ipv4/ip_output.c
• Orig date: Thu Apr 12 12:11:39 2001

diff -u --recursive --new-file v2.4.5/linux/net/ipv4/ip_output.c linux/net/ipv4/ip_output.c
@@ -5,7 +5,7 @@
  *
  *		The Internet Protocol (IP) output module.
  *
- * Version:	$Id: ip_output.c,v 1.91 2001/03/29 06:25:55 davem Exp $
+ * Version:	$Id: ip_output.c,v 1.93 2001/06/01 14:59:31 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -499,7 +499,7 @@
 	 *	Begin outputting the bytes.
 	 */
 
-	id = (sk ? sk->protinfo.af_inet.id++ : 0);
+	id = sk->protinfo.af_inet.id++;
 
 	do {
 		char *data;
@@ -848,6 +848,7 @@
 		offset += len;
 
 #ifdef CONFIG_NETFILTER
+		skb2->nfmark = skb->nfmark;
 		/* Connection association is same as pre-frag packet */
 		skb2->nfct = skb->nfct;
 		nf_conntrack_get(skb2->nfct);