Author: markj
Date: Wed Jul  1 15:00:03 2020
New Revision: 362835
URL: https://svnweb.freebsd.org/changeset/base/362835

Log:
  MFC r362582:
  ipfw(8): In fill_ip6(), use a single statement for both "me" and "me6".

Modified:
  stable/12/sbin/ipfw/ipv6.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sbin/ipfw/ipv6.c
==============================================================================
--- stable/12/sbin/ipfw/ipv6.c  Wed Jul  1 12:07:28 2020        (r362834)
+++ stable/12/sbin/ipfw/ipv6.c  Wed Jul  1 15:00:03 2020        (r362835)
@@ -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);
        }
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to