D41717.diff
No OneTemporary
Actions

Size

599 B

Referenced Files

None

Subscribers

None

D41717.diff
View Options

	diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
	--- a/sys/net/if_vlan.c
	+++ b/sys/net/if_vlan.c
	@@ -1106,11 +1106,8 @@
	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 @@
	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);