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

batman at open-mesh.org batman at open-mesh.org
Wed Jan 16 00:20:28 CET 2013


The following commit has been merged in the master branch:
commit 8425ec6aea20f8c8e1783d7390f5ea6ca01c58e1
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Mon Nov 19 09:01:44 2012 +0100

    batman-adv: remove useless assignment in tt_local_add()
    
    The flag field of the tt_local_entry->common structure in
    tt_local_add() is first assigned NO_FLAGS and then TT_CLIENT_NEW so
    nullifying the first operation. For this reason it is safe to remove
    the first assignment.
    
    This was introuduced by ("batman-adv: keep local table consistency for
    further TT_RESPONSE")
    
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 40ef955..5f44232 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -305,7 +305,11 @@ void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
 		   (uint8_t)atomic_read(&bat_priv->tt.vn));
 
 	memcpy(tt_local->common.addr, addr, ETH_ALEN);
-	tt_local->common.flags = BATADV_NO_FLAGS;
+	/* The local entry has to be marked as NEW to avoid to send it in
+	 * a full table response going out before the next ttvn increment
+	 * (consistency check)
+	 */
+	tt_local->common.flags = BATADV_TT_CLIENT_NEW;
 	if (batadv_is_wifi_iface(ifindex))
 		tt_local->common.flags |= BATADV_TT_CLIENT_WIFI;
 	atomic_set(&tt_local->common.refcount, 2);
@@ -316,12 +320,6 @@ void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
 	if (batadv_compare_eth(addr, soft_iface->dev_addr))
 		tt_local->common.flags |= BATADV_TT_CLIENT_NOPURGE;
 
-	/* The local entry has to be marked as NEW to avoid to send it in
-	 * a full table response going out before the next ttvn increment
-	 * (consistency check)
-	 */
-	tt_local->common.flags |= BATADV_TT_CLIENT_NEW;
-
 	hash_added = batadv_hash_add(bat_priv->tt.local_hash, batadv_compare_tt,
 				     batadv_choose_orig, &tt_local->common,
 				     &tt_local->common.hash_entry);

-- 
LinuxNextTracking


More information about the linux-merge mailing list