[linux-next] LinuxNextTracking branch, master, updated. next-20121101

batman at open-mesh.org batman at open-mesh.org
Fri Nov 2 00:17:20 CET 2012


The following commit has been merged in the master branch:
commit fe3f4cfe8ef8b4f0979a0dd61f60de832848664a
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon Aug 20 10:26:49 2012 +0200

    batman-adv: Only increase refcounter once for alternate router
    
    The test whether we can use a router for alternating bonding should only be
    done once because it is already known that it is still usable and will not be
    deleted from the list soon.
    
    This patch addresses Coverity #712285: Unchecked return value
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 8bdafc8..1ac072d 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -549,25 +549,18 @@ batadv_find_ifalter_router(struct batadv_orig_node *primary_orig,
 		if (tmp_neigh_node->if_incoming == recv_if)
 			continue;
 
-		if (!atomic_inc_not_zero(&tmp_neigh_node->refcount))
+		if (router && tmp_neigh_node->tq_avg <= router->tq_avg)
 			continue;
 
-		/* if we don't have a router yet
-		 * or this one is better, choose it.
-		 */
-		if ((!router) ||
-		    (tmp_neigh_node->tq_avg > router->tq_avg)) {
-			/* decrement refcount of
-			 * previously selected router
-			 */
-			if (router)
-				batadv_neigh_node_free_ref(router);
+		if (!atomic_inc_not_zero(&tmp_neigh_node->refcount))
+			continue;
 
-			router = tmp_neigh_node;
-			atomic_inc_not_zero(&router->refcount);
-		}
+		/* decrement refcount of previously selected router */
+		if (router)
+			batadv_neigh_node_free_ref(router);
 
-		batadv_neigh_node_free_ref(tmp_neigh_node);
+		/* we found a better router (or at least one valid router) */
+		router = tmp_neigh_node;
 	}
 
 	/* use the first candidate if nothing was found. */

-- 
LinuxNextTracking


More information about the linux-merge mailing list