diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2023-09-04 23:26:07 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2023-09-08 10:09:23 +0000 |
| commit | 6d5d8c7b2c745f29533a63d6bced705b9ecb1a57 (patch) | |
| tree | e29fbef9006cd3b934099db83bc1b45b4526951e | |
| parent | 17ed300f0833c8e6dd6bce95748f5dbe33050a3c (diff) | |
| download | src-6d5d8c7b2c745f29533a63d6bced705b9ecb1a57.tar.gz src-6d5d8c7b2c745f29533a63d6bced705b9ecb1a57.zip | |
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)
| -rw-r--r-- | sys/net/if_vlan.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 6c777a855039..9d0e6ae66b31 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1054,11 +1054,8 @@ vlan_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) 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); @@ -2034,10 +2031,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); |