D50570.id156196.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50570.id156196.diff
View Options

	diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h
	--- a/sys/net/ethernet.h
	+++ b/sys/net/ethernet.h
	@@ -80,6 +80,23 @@
	(((addr)[0] \| (addr)[1] \| (addr)[2] \| \
	(addr)[3] \| (addr)[4] \| (addr)[5]) == 0x00)

	+/*
	+ * 802.1q VID constants from IEEE 802.1Q-2014, table 9-2.
	+ */
	+
	+/* Null VID: The tag contains only PCP (priority) and DEI information. */
	+#define DOT1Q_VID_NULL 0x0
	+/* The default PVID for a bridge port. NB: bridge(4) does not honor this. */
	+#define DOT1Q_VID_DEF_PVID 0x1
	+/* The default SR_PVID for SRP Stream related traffic. */
	+#define DOT1Q_VID_DEF_SR_PVID 0x2
	+/* A VID reserved for implementation use, not permitted on the wire. */
	+#define DOT1Q_VID_RSVD_IMPL 0xfff
	+/* The lowest valid VID. */
	+#define DOT1Q_VID_MIN 0x1
	+/* The highest valid VID. */
	+#define DOT1Q_VID_MAX 0xffe
	+
	/*
	* This is the type of the VLAN ID inside the tag, not the tag itself.
	*/
	diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
	--- a/sys/net/if_vlan_var.h
	+++ b/sys/net/if_vlan_var.h
	@@ -126,13 +126,6 @@

	#define VLAN_PCP_MAX 7

	-#define DOT1Q_VID_NULL 0x0
	-#define DOT1Q_VID_DEF_PVID 0x1
	-#define DOT1Q_VID_DEF_SR_PVID 0x2
	-#define DOT1Q_VID_RSVD_IMPL 0xfff
	-#define DOT1Q_VID_MIN 1 /* minimum valid vlan id */
	-#define DOT1Q_VID_MAX 4094 /* maximum valid vlan id */
	-
	/*
	* 802.1q full tag. Proto and vid are stored in host byte order.
	*/