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

batman at open-mesh.org batman at open-mesh.org
Tue Jan 31 00:15:51 CET 2017


The following commit has been merged in the master branch:
commit 269cee621847a09b9cfcdb6469ff9b546efbcac1
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Dec 17 11:58:29 2016 +0100

    batman-adv: Remove unused variable in batadv_tt_local_set_flags
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 941afad..6077a87 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -3714,7 +3714,6 @@ static void batadv_tt_local_set_flags(struct batadv_priv *bat_priv, u16 flags,
 {
 	struct batadv_hashtable *hash = bat_priv->tt.local_hash;
 	struct batadv_tt_common_entry *tt_common_entry;
-	u16 changed_num = 0;
 	struct hlist_head *head;
 	u32 i;
 
@@ -3736,7 +3735,6 @@ static void batadv_tt_local_set_flags(struct batadv_priv *bat_priv, u16 flags,
 					continue;
 				tt_common_entry->flags &= ~flags;
 			}
-			changed_num++;
 
 			if (!count)
 				continue;

-- 
LinuxNextTracking


More information about the linux-merge mailing list