svn commit: r362582 - head/sbin/ipfw

[Mark Johnston]

Author: markj
Date: Wed Jun 24 15:05:42 2020
New Revision: 362582
URL: https://svnweb.freebsd.org/changeset/base/362582

Log:
  ipfw(8): In fill_ip6(), use a single statement for both "me" and "me6".
  
  Submitted by:	Neel Chauhan <neel AT neelc DOT org>
  Reviewed by:	rgrimes, Lutz Donnerhacke
  MFC after:	1 week
  Differential Revision:	https://reviews.freebsd.org/D24403

Modified:
  head/sbin/ipfw/ipv6.c

Modified: head/sbin/ipfw/ipv6.c
==============================================================================
--- head/sbin/ipfw/ipv6.c	Wed Jun 24 14:47:51 2020	(r362581)
+++ head/sbin/ipfw/ipv6.c	Wed Jun 24 15:05:42 2020	(r362582)
@@ -342,13 +342,8 @@ fill_ip6(ipfw_insn_ip6 *cmd, char *av, int cblen, stru
 	if (strcmp(av, "any") == 0)
 		return (1);
 
-
-	if (strcmp(av, "me") == 0) {	/* Set the data for "me" opt*/
-		cmd->o.len |= F_INSN_SIZE(ipfw_insn);
-		return (1);
-	}
-
-	if (strcmp(av, "me6") == 0) {	/* Set the data for "me" opt*/
+	/* Set the data for "me" opt */
+	if (strcmp(av, "me") == 0 || strcmp(av, "me6") == 0) {
 		cmd->o.len |= F_INSN_SIZE(ipfw_insn);
 		return (1);
 	}