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

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

The following commit has been merged in the master branch:
commit e2cbc11c0e1225bd5fe183a967fc80df3db10745
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Sun May 8 20:52:57 2011 +0200

    batman-adv: move neigh_node->if_incoming->if_status check in find_router()
    Every time that find_router() is invoked, if_status has to be compared with
    IF_ACTIVE. Moving this comparison inside find_router() will avoid to write it
    each time.
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index bb1c3ec..8c403ce 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -1240,6 +1240,9 @@ struct neigh_node *find_router(struct bat_priv *bat_priv,
 		router = find_ifalter_router(primary_orig_node, recv_if);
+	if (router && router->if_incoming->if_status != IF_ACTIVE)
+		goto err_unlock;
 	return router;
diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index 19c3daf..bab6076 100644
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -314,9 +314,6 @@ find_router:
 	if (!neigh_node)
 		goto out;
-	if (neigh_node->if_incoming->if_status != IF_ACTIVE)
-		goto out;
 	if (my_skb_head_push(skb, sizeof(struct unicast_packet)) < 0)
 		goto out;


More information about the linux-merge mailing list