Merge remote-tracking branch 'origin/ovs-dev' into bsd-port

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

diff --git a/lib/mac-learning.c b/lib/mac-learning.c
index e0618c2..3c541af 100644 (file)
--- a/lib/mac-learning.c
+++ b/lib/mac-learning.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 #include "poll-loop.h"
 #include "tag.h"
 #include "timeval.h"
+#include "unaligned.h"
 #include "util.h"
 #include "vlan-bitmap.h"
 #include "vlog.h"
@@ -49,7 +50,9 @@ static uint32_t
 mac_table_hash(const struct mac_learning *ml, const uint8_t mac[ETH_ADDR_LEN],
                uint16_t vlan)
 {
-    return hash_bytes(mac, ETH_ADDR_LEN, vlan ^ ml->secret);
+    unsigned int mac1 = get_unaligned_u32((uint32_t *) mac);
+    unsigned int mac2 = get_unaligned_u16((uint16_t *) (mac + 4));
+    return hash_3words(mac1, mac2 | (vlan << 16), ml->secret);
 }
 
 static struct mac_entry *