system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-07 00:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

if_vlan: Always default to 802.1q.

Browse source 
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
This commit is contained in:
Dag-Erling Smørgrav 2023-09-04 23:26:07 +00:00
parent f49d6f583e
commit b451dcc84f
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/net/if_vlan.c
View file

@ -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);