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

batman at open-mesh.org batman at open-mesh.org
Wed Mar 7 00:16:32 CET 2018


The following commit has been merged in the master branch:
commit d7625f9f72dc148b4f25d9bc5014b710e1024b15
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Feb 20 12:08:10 2018 +0100

    batman-adv: Avoid relation operator comparison with bool
    
    commit 785ea1144182 ("batman-adv: Distributed ARP Table - create DHT helper
    functions") introduced a return check of batadv_compare_eth which uses a
    boolean return value since commit 16af73458aca ("batman-adv: main,
    batadv_compare_eth return bool"). A relational (<, >, <= or >=) operator
    is not the right one for such a check.
    
    Reported-by: David Binderman <dcb314 at hotmail.com>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Acked-by: Antonio Quartulli <a at unstable.cc>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index 19b15de455ab..4469dcc1558f 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -495,7 +495,7 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res,
 	 * the one with the lowest address
 	 */
 	if (tmp_max == max && max_orig_node &&
-	    batadv_compare_eth(candidate->orig, max_orig_node->orig) > 0)
+	    batadv_compare_eth(candidate->orig, max_orig_node->orig))
 		goto out;
 
 	ret = true;

-- 
LinuxNextTracking


More information about the linux-merge mailing list