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
revalidator: Fix ukey stats cache updating.
[sliver-openvswitch.git]
/
lib
/
mac-learning.c
diff --git
a/lib/mac-learning.c
b/lib/mac-learning.c
index
01a34f5
..
7dcce41
100644
(file)
--- a/
lib/mac-learning.c
+++ b/
lib/mac-learning.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013
, 2014
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-45,9
+45,7
@@
static uint32_t
mac_table_hash(const struct mac_learning *ml, const uint8_t mac[ETH_ADDR_LEN],
uint16_t vlan)
{
mac_table_hash(const struct mac_learning *ml, const uint8_t mac[ETH_ADDR_LEN],
uint16_t vlan)
{
- unsigned int mac1 = get_unaligned_u32(ALIGNED_CAST(uint32_t *, mac));
- unsigned int mac2 = get_unaligned_u16(ALIGNED_CAST(uint16_t *, mac + 4));
- return hash_3words(mac1, mac2 | (vlan << 16), ml->secret);
+ return hash_mac(mac, vlan, ml->secret);
}
static struct mac_entry *
}
static struct mac_entry *
@@
-141,7
+139,6
@@
mac_learning_unref(struct mac_learning *ml)
bitmap_free(ml->flood_vlans);
ovs_rwlock_destroy(&ml->rwlock);
bitmap_free(ml->flood_vlans);
ovs_rwlock_destroy(&ml->rwlock);
- ovs_refcount_destroy(&ml->ref_cnt);
free(ml);
}
}
free(ml);
}
}