patch-2.2.18 linux/net/ipv6/reassembly.c

• Lines: 25
• Date: Sun Sep 17 17:56:18 2000
• Orig file: v2.2.17/net/ipv6/reassembly.c
• Orig date: Fri Apr 21 12:47:16 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/net/ipv6/reassembly.c linux/net/ipv6/reassembly.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Pedro Roque		<roque@di.fc.ul.pt>	
  *
- *	$Id: reassembly.c,v 1.11 1998/08/26 12:05:16 davem Exp $
+ *	$Id: reassembly.c,v 1.11.2.1 2000/09/13 00:49:39 davem Exp $
  *
  *	Based on: net/ipv4/ip_fragment.c
  *
@@ -160,6 +160,15 @@
 		icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, skb->h.raw);
 		return NULL;
 	}
+ 
+	if (!(fhdr->frag_off & __constant_htons(0xFFF9))) {
+		/* It is not a fragmented frame */
+		skb->h.raw += sizeof(struct frag_hdr);
+		ipv6_statistics.Ip6ReasmOKs++;
+
+		return &fhdr->nexthdr;
+	}
+
 	if (atomic_read(&ip6_frag_mem) > sysctl_ip6frag_high_thresh)
 		frag_prune();