D9607.id25199.diff
No OneTemporary
Actions

Size

804 B

Referenced Files

None

Subscribers

None

D9607.id25199.diff
View Options

	Index: sys/dev/etherswitch/mtkswitch/mtkswitch_rt3050.c
	===================================================================
	--- sys/dev/etherswitch/mtkswitch/mtkswitch_rt3050.c
	+++ sys/dev/etherswitch/mtkswitch/mtkswitch_rt3050.c
	@@ -405,10 +405,11 @@
	MTKSWITCH_LOCK(sc);
	/* First, see if we can accomodate the request at all */
	val = MTKSWITCH_READ(sc, MTKSWITCH_POC2);
	- if ((val & POC2_UNTAG_VLAN) == 0 \|\|
	- sc->sc_switchtype == MTK_SWITCH_RT3050) {
	- val &= VUB_MASK;
	- tmp = v->es_untagged_ports & v->es_member_ports;
	+ if (sc->sc_switchtype == MTK_SWITCH_RT3050 \|\|
	+ (val & POC2_UNTAG_VLAN) == 0) {
	+ /* check port base untag setting */
	+ val &= v->es_member_ports;
	+ tmp = v->es_untagged_ports;
	if (val != tmp) {
	/* Cannot accomodate request */
	MTKSWITCH_UNLOCK(sc);