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

batman at open-mesh.org batman at open-mesh.org
Fri Nov 2 00:17:21 CET 2012

The following commit has been merged in the master branch:
commit fdf7932052209260ca2e7add4da4b74f57976336
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Fri Aug 24 17:54:07 2012 +0200

    batman-adv: properly store the roaming time
    in case of a new global entry added because of roaming, the roam_at field must
    be properly initiated with the current time. This value will be later use to
    purge this entry out on time out (if nobody claims it). Instead roam_at field
    is now set to zero in this situation leading to an immediate purging of the
    related entry.
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 42a74e3..0ac39d5 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -726,6 +726,12 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv,
 		common->flags = flags;
 		tt_global_entry->roam_at = 0;
+		/* node must store current time in case of roaming. This is
+		 * needed to purge this entry out on timeout (if nobody claims
+		 * it)
+		 */
+		if (flags & BATADV_TT_CLIENT_ROAM)
+			tt_global_entry->roam_at = jiffies;
 		atomic_set(&common->refcount, 2);
 		common->added_at = jiffies;


More information about the linux-merge mailing list