From 02f31bb54e7be59e425c03a25067a4e535bfe938 Mon Sep 17 00:00:00 2001
From: Chris Cappuccio <chris@nmedia.net>
Date: Sun, 2 May 2021 12:42:56 -0700
Subject: [PATCH] remove more ancient stuff, in this case, OpenBSD 5.9 compat
 vlan code

---
 commands.c |  1 -
 conf.c     |  2 +-
 externs.h  |  1 -
 if.c       | 86 ------------------------------------------------------
 4 files changed, 1 insertion(+), 89 deletions(-)

diff --git a/commands.c b/commands.c
index 5b44e8cd..57e2c617 100644
--- a/commands.c
+++ b/commands.c
@@ -534,7 +534,6 @@ struct intlist Intlist[] = {
 	{ "carppeer",	"CARP peer",				CMPL0 0, 0, intcarp },
 	{ "balancing",	"CARP balancing mode",			CMPL0 0, 0, intcarp },
 	{ "pflow",	"pflow data export",			CMPL0 0, 0, intpflow },
-	{ "vlan",	"802.1Q vlan tag and parent",		CMPL0 0, 0, intvlan },	/* XXX bkcompat */
 	{ "debug",	"Driver dependent debugging",		CMPL0 0, 0, intflags },
 	{ "dhcrelay",	"DHCP Relay Agent",			CMPL0 0, 0, intdhcrelay },
 	{ "wol",	"Wake On LAN",				CMPL0 0, 0, intxflags },
diff --git a/conf.c b/conf.c
index c6280bdf..537f1aed 100644
--- a/conf.c
+++ b/conf.c
@@ -603,7 +603,7 @@ void conf_vnetid(FILE *output, int ifs, char *ifname)
 
 	if (((vnetid = get_vnetid(ifs, ifname)) != 0))
 		if (vnetid < 0)
-			fprintf(output, " vnetid any\n", vnetid);
+			fprintf(output, " vnetid any\n");
 		else
 			fprintf(output, " vnetid %lld\n", vnetid);
 }
diff --git a/externs.h b/externs.h
index ca8b7b93..3378a307 100644
--- a/externs.h
+++ b/externs.h
@@ -397,7 +397,6 @@ int intdhcrelay(char *, int, int, char **);
 int intmetric(char *, int, int, char **);
 int intllprio(char *, int, int, char **);
 int intrtd(char *, int, int, char **);
-int intvlan(char *, int, int, char **);
 int intflags(char *, int, int, char **);
 int intxflags(char *, int, int, char **);
 int intaf(char *, int, int, char **);
diff --git a/if.c b/if.c
index a9d08fbd..308c0b61 100644
--- a/if.c
+++ b/if.c
@@ -1530,92 +1530,6 @@ intllprio(char *ifname, int ifs, int argc, char **argv)
 	return(0);
 }
 
-int
-intvlan(char *ifname, int ifs, int argc, char **argv)
-{
-#ifndef SIOCSIFPARENT /* 5.9- */
-	const char *errmsg = NULL;
-	struct ifreq ifr;
-	struct vlanreq vreq;
-#endif
-	int set;
-
-	if (NO_ARG(argv[0])) {
-		set = 0;
-		argc--;
-		argv++;
-	} else
-		set = 1;
-
-	argc--;
-	argv++;
-
-	if ((set && argc != 3) || (!set && argc > 3) ||
-	    (argc == 3 && !isprefix(argv[1], "parent"))) {
-		printf("%% vlan <tag> parent <parent interface>\n");
-		printf("%% no vlan [tag] [parent <parent interface>]\n");
-		return 0;
-	}
-
-#ifndef SIOCSIFPARENT /* 5.9- */
-	strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-
-	bzero(&vreq, sizeof(vreq));
-
-	ifr.ifr_data = (caddr_t)&vreq;
-
-	if (ioctl(ifs, SIOCGETVLAN, (caddr_t)&ifr) == -1) {
-		switch(errno) {
-		case ENOTTY:
-			printf("%% This interface does not support vlan"
-			    " tagging\n");
-			break;
-		default:
-			printf("%% intvlan: SIOCGETVLAN: %s\n",
-			    strerror(errno));
-		}
-		return(0);
-	}
-#endif
-	if (set) {
-		if (!is_valid_ifname(argv[2]) || is_bridge(ifs, argv[2])) {
-			printf("%% Invalid vlan parent %s\n", argv[2]);
-			return 0;
-		}
-#ifndef SIOCSIFPARENT	/* 5.9- */
-		strlcpy(vreq.vlr_parent, argv[2], sizeof(vreq.vlr_parent));
-		vreq.vlr_tag = strtonum(argv[0], 0, 4095, &errmsg);
-		if (errmsg) {
-			printf("%% Invalid vlan tag %s: %s", argv[0], errmsg);
-			return 0;
-		}
-		if (vreq.vlr_tag != EVL_VLANOFTAG(vreq.vlr_tag)) {
-			printf("%% Invalid vlan tag %s\n", argv[0]);
-			return 0;
-		}
-	} else {
-		bzero(&vreq.vlr_parent, sizeof(vreq.vlr_parent));
-		vreq.vlr_tag = 0;
-#endif
-	}
-
-	if (set) {
-		char *vnet_argv[] = { "vnetid", argv[0], NULL };
-		char *par_argv[] = { "parent", argv[2], NULL };
-
-		intparent(ifname, ifs, 2, par_argv);
-		intvnetid(ifname, ifs, 2, vnet_argv);
-	} else {
-		char *vnet_argv[] = { "no", "vnetid" };
-		char *par_argv[] = { "no", "parent" };
-
-		intparent(ifname, ifs, 2, par_argv);
-		intvnetid(ifname, ifs, 2, vnet_argv);
-	}
-
-	return 0;
-}
-
 int
 intgroup(char *ifname, int ifs, int argc, char **argv)
 {