D28245.id82594.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D28245.id82594.diff
View Options

	Index: sbin/ifconfig/ifconfig.8
	===================================================================
	--- sbin/ifconfig/ifconfig.8
	+++ sbin/ifconfig/ifconfig.8
	@@ -2706,6 +2706,10 @@
	.Dq 802.1ad .
	The default encapsulation protocol is
	.Dq 802.1Q .
	+The protocol
	+.Dq QinQ
	+is an convenience alias for
	+.Dq 802.1ad .
	.It Cm vlanpcp Ar priority_code_point
	Priority code point
	.Pq Dv PCP
	Index: sbin/ifconfig/ifvlan.c
	===================================================================
	--- sbin/ifconfig/ifvlan.c
	+++ sbin/ifconfig/ifvlan.c
	@@ -68,6 +68,7 @@

	static const char proto_8021Q[] = "802.1q";
	static const char proto_8021ad[] = "802.1ad";
	+static const char proto_qinq[] = "qinq";

	static struct vlanreq params = {
	.vlr_tag = NOTAG,
	@@ -220,8 +221,8 @@
	if (strncasecmp(proto_8021Q, val,
	strlen(proto_8021Q)) == 0) {
	params.vlr_proto = ETHERTYPE_VLAN;
	- } else if (strncasecmp(proto_8021ad, val,
	- strlen(proto_8021ad)) == 0) {
	+ } else if ((strncasecmp(proto_8021ad, val, strlen(proto_8021ad)) == 0)
	+ \|\| (strncasecmp(proto_qinq, val, strlen(proto_qinq)) == 0)) {
	params.vlr_proto = ETHERTYPE_QINQ;
	} else
	errx(1, "invalid value for vlanproto");