D35848.diff
No OneTemporary
Actions

Size

677 B

Referenced Files

None

Subscribers

None

D35848.diff
View Options

	diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c
	--- a/sbin/ifconfig/ifvlan.c
	+++ b/sbin/ifconfig/ifvlan.c
	@@ -204,8 +204,11 @@
	if (params.vlr_tag != ul)
	errx(1, "value for vlan out of range");

	- if (getvlan(s, &ifr, &vreq) != -1)
	+ if (getvlan(s, &ifr, &vreq) != -1) {
	+ vreq.vlr_tag = params.vlr_tag;
	+ memcpy(&params, &vreq, sizeof(params));
	vlan_set(s, &ifr);
	+ }
	}

	static
	@@ -233,8 +236,11 @@
	} else
	errx(1, "invalid value for vlanproto");

	- if (getvlan(s, &ifr, &vreq) != -1)
	+ if (getvlan(s, &ifr, &vreq) != -1) {
	+ vreq.vlr_proto = params.vlr_proto;
	+ memcpy(&params, &vreq, sizeof(params));
	vlan_set(s, &ifr);
	+ }
	}

	static