vlan-bitmap: New data structure.

[sliver-openvswitch.git] / lib / mac-learning.c

diff --git a/lib/mac-learning.c b/lib/mac-learning.c
index 0bee152..a57bbc7 100644 (file)
--- a/lib/mac-learning.c
+++ b/lib/mac-learning.c
@@ -29,6 +29,7 @@
 #include "tag.h"
 #include "timeval.h"
 #include "util.h"
+#include "vlan-bitmap.h"
 #include "vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(mac_learning);
@@ -105,16 +106,6 @@ get_lru(struct mac_learning *ml, struct mac_entry **e)
     }
 }
 
-/* Removes 'e' from the 'ml' hash table.  'e' must not already be on the free
- * list. */
-static void
-free_mac_entry(struct mac_learning *ml, struct mac_entry *e)
-{
-    list_remove(&e->hash_node);
-    list_remove(&e->lru_node);
-    list_push_front(&ml->free, &e->lru_node);
-}
-
 /* Creates and returns a new MAC learning table. */
 struct mac_learning *
 mac_learning_create(void)
@@ -153,10 +144,7 @@ mac_learning_destroy(struct mac_learning *ml)
 bool
 mac_learning_set_flood_vlans(struct mac_learning *ml, unsigned long *bitmap)
 {
-    bool ret = (bitmap == NULL
-                ? ml->flood_vlans != NULL
-                : (ml->flood_vlans == NULL
-                   || !bitmap_equal(bitmap, ml->flood_vlans, 4096)));
+    bool ret = vlan_bitmap_equal(ml->flood_vlans, bitmap);
 
     bitmap_free(ml->flood_vlans);
     ml->flood_vlans = bitmap;
@@ -167,7 +155,7 @@ mac_learning_set_flood_vlans(struct mac_learning *ml, unsigned long *bitmap)
 static bool
 is_learning_vlan(const struct mac_learning *ml, uint16_t vlan)
 {
-    return !(ml->flood_vlans && bitmap_is_set(ml->flood_vlans, vlan));
+    return vlan_bitmap_contains(ml->flood_vlans, vlan);
 }
 
 /* Returns true if 'src_mac' may be learned on 'vlan' for 'ml'.
@@ -268,6 +256,16 @@ mac_learning_lookup(const struct mac_learning *ml,
     }
 }
 
+/* Expires 'e' from the 'ml' hash table.  'e' must not already be on the free
+ * list. */
+void
+mac_learning_expire(struct mac_learning *ml, struct mac_entry *e)
+{
+    list_remove(&e->hash_node);
+    list_remove(&e->lru_node);
+    list_push_front(&ml->free, &e->lru_node);
+}
+
 /* Expires all the mac-learning entries in 'ml'.  The tags in 'ml' are
  * discarded, so the client is responsible for revalidating any flows that
  * depend on 'ml', if necessary. */
@@ -276,7 +274,7 @@ mac_learning_flush(struct mac_learning *ml)
 {
     struct mac_entry *e;
     while (get_lru(ml, &e)){
-        free_mac_entry(ml, e);
+        mac_learning_expire(ml, e);
     }
 }
 
@@ -289,7 +287,7 @@ mac_learning_run(struct mac_learning *ml, struct tag_set *set)
         if (set) {
             tag_set_add(set, e->tag);
         }
-        free_mac_entry(ml, e);
+        mac_learning_expire(ml, e);
     }
 }