svn commit: r349400 - head/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Wed Jun 26 00:53:46 2019
New Revision: 349400
URL: https://svnweb.freebsd.org/changeset/base/349400

Log:
  Remove a tautological compare for offset != 0.
  
  MFC after:	1 week

Modified:
  head/sys/contrib/ipfilter/netinet/fil.c

Modified: head/sys/contrib/ipfilter/netinet/fil.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/fil.c	Wed Jun 26 00:53:43 2019	(r349399)
+++ head/sys/contrib/ipfilter/netinet/fil.c	Wed Jun 26 00:53:46 2019	(r349400)
@@ -1732,24 +1732,22 @@ ipf_pr_ipv4hdr(fin)
 
 		fi->fi_flx |= FI_FRAG;
 		off &= IP_OFFMASK;
-		if (off != 0) {
-			fin->fin_flx |= FI_FRAGBODY;
-			off <<= 3;
-			if ((off + fin->fin_dlen > 65535) ||
-			    (fin->fin_dlen == 0) ||
-			    ((morefrag != 0) && ((fin->fin_dlen & 7) != 0))) {
-				/*
-				 * The length of the packet, starting at its
-				 * offset cannot exceed 65535 (0xffff) as the
-				 * length of an IP packet is only 16 bits.
-				 *
-				 * Any fragment that isn't the last fragment
-				 * must have a length greater than 0 and it
-				 * must be an even multiple of 8.
-				 */
-				fi->fi_flx |= FI_BAD;
-				DT1(ipf_fi_bad_fragbody_gt_65535, fr_info_t *, fin);
-			}
+		fin->fin_flx |= FI_FRAGBODY;
+		off <<= 3;
+		if ((off + fin->fin_dlen > 65535) ||
+		    (fin->fin_dlen == 0) ||
+		    ((morefrag != 0) && ((fin->fin_dlen & 7) != 0))) {
+			/*
+			 * The length of the packet, starting at its
+			 * offset cannot exceed 65535 (0xffff) as the
+			 * length of an IP packet is only 16 bits.
+			 *
+			 * Any fragment that isn't the last fragment
+			 * must have a length greater than 0 and it
+			 * must be an even multiple of 8.
+			 */
+			fi->fi_flx |= FI_BAD;
+			DT1(ipf_fi_bad_fragbody_gt_65535, fr_info_t *, fin);
 		}
 	}
 	fin->fin_off = off;