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

batman at open-mesh.org batman at open-mesh.org
Fri Jun 24 16:09:46 CEST 2011

The following commit has been merged in the master branch:
commit bb899b89f46eb1fd6f62a4c360f6511b9714e479
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue May 10 11:22:37 2011 +0200

    batman-adv: Ensure that we really have route changes in update_route
    The debug output of update_route has tests for "route deleted" and "route
    added". All other situations are handled as "route changed". This is not
    true because neigh_node and curr_router could be both NULL.
    The function is not called in this situation, but the code might be
    interpreted wrong when reading it without this test.
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 90ae6f0..368ceeb 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -108,7 +108,7 @@ static void update_route(struct bat_priv *bat_priv, struct orig_node *orig_node,
 				    tt_buff, tt_buff_len);
 	/* route changed */
-	} else {
+	} else if (neigh_node && curr_router) {
 		bat_dbg(DBG_ROUTES, bat_priv,
 			"Changing route towards: %pM "
 			"(now via %pM - was via %pM)\n",


More information about the linux-merge mailing list