From 2a1de3374fdaef45a82fbdc5ac91f0755802240f Mon Sep 17 00:00:00 2001
From: John-Mark Gurney <jmg@funkthat.com>
Date: Sat, 9 Jul 2022 15:31:20 -0700
Subject: [PATCH] not sure if this fix should remain, think it was to fix NOTE
 comment

---
 NOTES.md             | 4 ++++
 vlanmang/__init__.py | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NOTES.md b/NOTES.md
index f2a4227..fd3bf6a 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -60,6 +60,10 @@ NetGear GS108Tv2
 
 Does not list VLAN 1 under dot1qVlanStaticName.
 
+It appears that firmware v5.4.2.30 will not set a port to be untagged
+via SNMP.  If after configuring via SNMP, a UI visit appears to be
+required, toggle the setting and hit apply.
+
 NetGear GS724TPv2
 -----------------
 
diff --git a/vlanmang/__init__.py b/vlanmang/__init__.py
index ded4a15..76e3129 100644
--- a/vlanmang/__init__.py
+++ b/vlanmang/__init__.py
@@ -290,9 +290,8 @@ def checkchanges(module):
 		switchuntagged = switch.getuntagged(*vlans)
 		untagged = getuntagged(i.vlanconf, lufun)
 		for i in vlans:
-			if not _cmpbits(switchegress[i], egress[i]):
+			if not _cmpbits(switchegress[i], egress[i]) or not _cmpbits(switchuntagged[i], untagged[i]):
 				res.append((switch, name, 'setegress', i, egress[i], switchegress[i]))
-			if not _cmpbits(switchuntagged[i], untagged[i]):
 				res.append((switch, name, 'setuntagged', i, untagged[i], switchuntagged[i]))
 
 	return res