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

batman at open-mesh.org batman at open-mesh.org
Tue Nov 27 00:21:17 CET 2012


The following commit has been merged in the master branch:
commit e9c00136a4754829faf885cf966c9754c7734660
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Wed Nov 7 15:05:33 2012 +0100

    batman-adv: fix tt_global_entries flags update
    
    Flags carried by a change_entry have to be always copied into the
    client entry as they may contain important attributes (e.g.
    TT_CLIENT_WIFI).
    
    For instance, a client added by means of the "early detection
    mechanism" has no flag set at the beginning, so they must be updated once the
    proper ADD event is received.
    
    This was introduced by 30cfd02b60e1cb16f5effb0a01f826c5bb7e4c59
    ("batman-adv: detect not yet announced clients")
    
    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 112edd3..64c0012 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -769,6 +769,12 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv,
 		 */
 		tt_global_entry->common.flags &= ~BATADV_TT_CLIENT_TEMP;
 
+		/* the change can carry possible "attribute" flags like the
+		 * TT_CLIENT_WIFI, therefore they have to be copied in the
+		 * client entry
+		 */
+		tt_global_entry->common.flags |= flags;
+
 		/* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only
 		 * one originator left in the list and we previously received a
 		 * delete + roaming change for this originator.

-- 
LinuxNextTracking


More information about the linux-merge mailing list