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 branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
[sliver-openvswitch.git]
/
lib
/
mac-learning.c
diff --git
a/lib/mac-learning.c
b/lib/mac-learning.c
index
f609d48
..
052ac48
100644
(file)
--- a/
lib/mac-learning.c
+++ b/
lib/mac-learning.c
@@
-17,7
+17,6
@@
#include <config.h>
#include "mac-learning.h"
#include <config.h>
#include "mac-learning.h"
-#include <assert.h>
#include <inttypes.h>
#include <stdlib.h>
#include <inttypes.h>
#include <stdlib.h>
@@
-284,7
+283,7
@@
mac_learning_lookup(const struct mac_learning *ml,
} else {
struct mac_entry *e = mac_entry_lookup(ml, dst, vlan);
} else {
struct mac_entry *e = mac_entry_lookup(ml, dst, vlan);
- assert(e == NULL || e->tag != 0);
+
ovs_
assert(e == NULL || e->tag != 0);
if (tag) {
/* Tag either the learned port or the lack thereof. */
*tag |= e ? e->tag : make_unknown_mac_tag(ml, dst, vlan);
if (tag) {
/* Tag either the learned port or the lack thereof. */
*tag |= e ? e->tag : make_unknown_mac_tag(ml, dst, vlan);