Prepare Open vSwitch 1.1.2 release.

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

diff --git a/lib/mac-learning.h b/lib/mac-learning.h
index 2bff465..51a7ac7 100644 (file)
--- a/lib/mac-learning.h
+++ b/lib/mac-learning.h
@@ -48,6 +48,7 @@ struct mac_entry {
 
     /* Learned port. */
     union {
+        void *p;
         int i;
     } port;
 };
@@ -72,7 +73,7 @@ static inline void mac_entry_set_grat_arp_lock(struct mac_entry *mac)
  * has ever been asserted or if it has expired. */
 static inline bool mac_entry_is_grat_arp_locked(const struct mac_entry *mac)
 {
-    return time_now() >= mac->grat_arp_lock;
+    return time_now() < mac->grat_arp_lock;
 }
 
 /* MAC learning table. */
@@ -112,6 +113,7 @@ struct mac_entry *mac_learning_lookup(const struct mac_learning *,
                                       uint16_t vlan, tag_type *);
 
 /* Flushing. */
+void mac_learning_expire(struct mac_learning *, struct mac_entry *);
 void mac_learning_flush(struct mac_learning *);
 
 #endif /* mac-learning.h */