[PATCH] VLAN:fix vlan_compare for tagged VLANs

michael-dev at fami-braun.de michael-dev at fami-braun.de
Sun Feb 21 03:01:39 PST 2016


From: Michael Braun <michael-dev at fami-braun.de>

While refactoring vlan comparison into vlan_compare, it was overlooked that it needs modification for tagged vlan support.

Signed-off-by: Michael Braun <michael-dev at fami-braun.de>
---
 src/ap/vlan.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/ap/vlan.c b/src/ap/vlan.c
index 80ae984..b6f6bb1 100644
--- a/src/ap/vlan.c
+++ b/src/ap/vlan.c
@@ -16,6 +16,7 @@
  */
 int vlan_compare(struct vlan_description *a, struct vlan_description *b)
 {
+	int i;
 	const int a_empty = !a || !a->notempty;
 	const int b_empty = !b || !b->notempty;
 
@@ -25,5 +26,9 @@ int vlan_compare(struct vlan_description *a, struct vlan_description *b)
 		return 1;
 	if (a->untagged != b->untagged)
 		return 1;
+	for (i = 0; i < MAX_NUM_TAGGED_VLAN; i++) {
+		if (a->tagged[i] != b->tagged[i])
+			return 1;
+	}
 	return 0;
 }
-- 
2.1.4




More information about the Hostap mailing list