git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "master" into "wdp".
[sliver-openvswitch.git]
/
lib
/
mac-learning.c
diff --git
a/lib/mac-learning.c
b/lib/mac-learning.c
index
3623470
..
1614129
100644
(file)
--- a/
lib/mac-learning.c
+++ b/
lib/mac-learning.c
@@
-296,17
+296,18
@@
mac_learning_flush(struct mac_learning *ml)
}
}
}
}
-void
-mac_learning_run(struct mac_learning *ml
, struct tag_set *set
)
+tag_type
+mac_learning_run(struct mac_learning *ml)
{
struct mac_entry *e;
{
struct mac_entry *e;
+ tag_type tags = 0;
+
while (get_lru(ml, &e) && time_now() >= e->expires) {
COVERAGE_INC(mac_learning_expired);
while (get_lru(ml, &e) && time_now() >= e->expires) {
COVERAGE_INC(mac_learning_expired);
- if (set) {
- tag_set_add(set, e->tag);
- }
+ tags |= e->tag;
free_mac_entry(ml, e);
}
free_mac_entry(ml, e);
}
+ return tags;
}
void
}
void