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

batman at open-mesh.org batman at open-mesh.org
Thu Dec 15 00:16:48 CET 2011


The following commit has been merged in the master branch:
commit 2ef04f4752a9687a03b16d4d908cf07ff8b96a3b
Author: Dan Carpenter <dan.carpenter at oracle.com>
Date:   Tue Nov 29 09:09:09 2011 +0300

    batman-adv: remove extra negation in gw_out_of_range()
    
    There is a typo here where an extra '!' made the check to the opposite
    of what was intended.
    
    Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 9373a14..24403a7 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -695,7 +695,7 @@ bool gw_out_of_range(struct bat_priv *bat_priv,
 	}
 
 	neigh_old = find_router(bat_priv, orig_dst_node, NULL);
-	if (!!neigh_old)
+	if (!neigh_old)
 		goto out;
 
 	if (curr_tq_avg - neigh_old->tq_avg > GW_THRESHOLD)

-- 
LinuxNextTracking


More information about the linux-merge mailing list