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

batman at open-mesh.org batman at open-mesh.org
Thu Aug 27 00:15:38 CEST 2015


The following commit has been merged in the master branch:
commit 87b40f534d2a266eec55a897e9a93f3b022c901d
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 17 10:03:42 2015 +0200

    batman-adv: Fix conditional statements indentation
    
    commit 29b9256e6631 ("batman-adv: consider outgoing interface in OGM
    sending") incorrectly indented the interface check code.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index df54118..5c12200 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -968,7 +968,7 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
 	rcu_read_lock();
 	list_for_each_entry_rcu(tmp_hard_iface, &batadv_hardif_list, list) {
 		if (tmp_hard_iface->soft_iface != hard_iface->soft_iface)
-				continue;
+			continue;
 		batadv_iv_ogm_queue_add(bat_priv, *ogm_buff,
 					*ogm_buff_len, hard_iface,
 					tmp_hard_iface, 1, send_time);

-- 
LinuxNextTracking


More information about the linux-merge mailing list