From a0fea1dc59d5eae266bef72e8f6ba9ca9d9f9691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Mon, 4 Sep 2023 23:26:07 +0000
Subject: [PATCH] if_vlan: Always default to 802.1q.

There is no reason for this fallback to be conditional on COMPAT_FREEBSD12.

PR:		273539
MFC after:	1 week
Sponsored by:	Klara, Inc.
Sponsored by:	NetApp, Inc.
Reviewed by:	melifaro, allanjude
Differential Revision:	https://reviews.freebsd.org/D41717

(cherry picked from commit b451dcc84f1cfd1d14ede8a53d1d8359c9b85c94)

Approved by:	re (gjb)
---
 sys/net/if_vlan.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 41a099c1407..e7a29056472 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1106,11 +1106,8 @@ vlan_clone_create(struct if_clone *ifc, char *name, size_t len,
 			return error;
 		vid = vlr.vlr_tag;
 		proto = vlr.vlr_proto;
-
-#ifdef COMPAT_FREEBSD12
 		if (proto == 0)
 			proto = ETHERTYPE_VLAN;
-#endif
 		p = ifunit_ref(vlr.vlr_parent);
 		if (p == NULL)
 			return (ENXIO);
@@ -2262,10 +2259,8 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			error = ENOENT;
 			break;
 		}
-#ifdef COMPAT_FREEBSD12
 		if (vlr.vlr_proto == 0)
 			vlr.vlr_proto = ETHERTYPE_VLAN;
-#endif
 		oldmtu = ifp->if_mtu;
 		error = vlan_config(ifv, p, vlr.vlr_tag, vlr.vlr_proto);
 		if_rele(p);