Changeset 1571

Timestamp:

02/14/10 16:05:18 (7 months ago)

Author:

simon

Message:

batman-adv: bonding: don't ask hash when already found primary router

The probability is very high that we are already dealing with the primary
router when searching for a bonding candidate, so check if we are already found
it before searching with hash_find().

Signed-off-by: Simon Wunderlich <siwu@…>

Files:

• trunk/batman-adv-kernelland/routing.c (modified) (1 diff)

trunk/batman-adv-kernelland/routing.c

@@ -938 +938 @@
 
         /* find the orig_node which has the primary interface. might
-         * even be the same as our orig_node in many cases */
-
-        primary_orig_node = hash_find(orig_hash, router_orig->primary_addr);
-        if (!primary_orig_node)
-                return orig_node->router;
+         * even be the same as our router_orig in many cases */
+
+        if (memcmp(router_orig->primary_addr,
+                                router_orig->orig, ETH_ALEN) == 0) {
+                primary_orig_node = router_orig;
+        } else {
+                primary_orig_node = hash_find(orig_hash,
+                                                router_orig->primary_addr);
+                if (!primary_orig_node)
+                        return orig_node->router;
+        }
 
         /* with less than 2 candidates, we can't do any