Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

39 files changed, 141 insertions, 156 deletions

diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile
index ce6861166499..4e392ebedb64 100644
--- a/net/batman-adv/Makefile
+++ b/net/batman-adv/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+# Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
 #
 # Marek Lindner, Simon Wunderlich
 #
diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h
index 755379fd367d..9852a688ba43 100644
--- a/net/batman-adv/bat_algo.h
+++ b/net/batman-adv/bat_algo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
diff --git a/net/batman-adv/bat_debugfs.c b/net/batman-adv/bat_debugfs.c
index a7a393eeb935..c3b0548b175d 100644
--- a/net/batman-adv/bat_debugfs.c
+++ b/net/batman-adv/bat_debugfs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
diff --git a/net/batman-adv/bat_debugfs.h b/net/batman-adv/bat_debugfs.h
index bc9cda3f01e1..d605c6746428 100644
--- a/net/batman-adv/bat_debugfs.h
+++ b/net/batman-adv/bat_debugfs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 1c483a5dd808..2b66daef1ef6 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c
index 480ae0a5ba43..b00101db5cc6 100644
--- a/net/batman-adv/bat_sysfs.c
+++ b/net/batman-adv/bat_sysfs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -321,11 +321,11 @@ static ssize_t store_gw_mode(struct kobject *kobj, struct attribute *attr,
                 gw_mode_tmp = GW_MODE_OFF;
 
         if (strncmp(buff, GW_MODE_CLIENT_NAME,
-                   strlen(GW_MODE_CLIENT_NAME)) == 0)
+                    strlen(GW_MODE_CLIENT_NAME)) == 0)
                 gw_mode_tmp = GW_MODE_CLIENT;
 
         if (strncmp(buff, GW_MODE_SERVER_NAME,
-                   strlen(GW_MODE_SERVER_NAME)) == 0)
+                    strlen(GW_MODE_SERVER_NAME)) == 0)
                 gw_mode_tmp = GW_MODE_SERVER;
 
         if (gw_mode_tmp < 0) {
diff --git a/net/batman-adv/bat_sysfs.h b/net/batman-adv/bat_sysfs.h
index a3f75a723c56..fece77ae586e 100644
--- a/net/batman-adv/bat_sysfs.h
+++ b/net/batman-adv/bat_sysfs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c
index 9bc63b209b3f..6d0aa216b232 100644
--- a/net/batman-adv/bitarray.c
+++ b/net/batman-adv/bitarray.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich, Marek Lindner
  *
@@ -154,8 +154,8 @@ int bit_get_packet(void *priv, unsigned long *seq_bits,
 
         /* sequence number is much newer, probably missed a lot of packets */
 
-        if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE)
-                && (seq_num_diff < EXPECTED_SEQNO_RANGE)) {
+        if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) &&
+            (seq_num_diff < EXPECTED_SEQNO_RANGE)) {
                 bat_dbg(DBG_BATMAN, bat_priv,
                         "We missed a lot of packets (%i) !\n",
                         seq_num_diff - 1);
@@ -170,8 +170,8 @@ int bit_get_packet(void *priv, unsigned long *seq_bits,
          * packet should be dropped without calling this function if the
          * seqno window is protected. */
 
-        if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE)
-                || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
+        if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) ||
+            (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
 
                 bat_dbg(DBG_BATMAN, bat_priv,
                         "Other host probably restarted!\n");
diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h
index 9c04422aeb07..c6135728a680 100644
--- a/net/batman-adv/bitarray.h
+++ b/net/batman-adv/bitarray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich, Marek Lindner
  *
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 24403a7350f7..0fa8e2d7c46e 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -396,7 +396,7 @@ void gw_node_purge(struct bat_priv *bat_priv)
 {
         struct gw_node *gw_node, *curr_gw;
         struct hlist_node *node, *node_tmp;
-        unsigned long timeout = 2 * PURGE_TIMEOUT * HZ;
+        unsigned long timeout = msecs_to_jiffies(2 * PURGE_TIMEOUT);
         int do_deselect = 0;
 
         curr_gw = gw_get_selected_gw_node(bat_priv);
@@ -629,7 +629,7 @@ bool gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len)
 
         /* check for bootp port */
         if ((ntohs(ethhdr->h_proto) == ETH_P_IP) &&
-             (ntohs(udphdr->dest) != 67))
+            (ntohs(udphdr->dest) != 67))
                 return false;
 
         if ((ntohs(ethhdr->h_proto) == ETH_P_IPV6) &&
diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h
index e1edba08eb1d..bf56a5aea10b 100644
--- a/net/batman-adv/gateway_client.h
+++ b/net/batman-adv/gateway_client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
index c4ac7b0a2a63..3ccb9c87fd19 100644
--- a/net/batman-adv/gateway_common.c
+++ b/net/batman-adv/gateway_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
@@ -93,7 +93,7 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
                         multi = 1024;
 
                 if ((strnicmp(tmp_ptr, "kbit", 4) == 0) ||
-                        (multi > 1))
+                    (multi > 1))
                         *tmp_ptr = '\0';
         }
 
@@ -118,7 +118,7 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
                                 multi = 1024;
 
                         if ((strnicmp(tmp_ptr, "kbit", 4) == 0) ||
-                                (multi > 1))
+                            (multi > 1))
                                 *tmp_ptr = '\0';
                 }
 
diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h
index 55e527a489fe..b8fb11c4f927 100644
--- a/net/batman-adv/gateway_common.h
+++ b/net/batman-adv/gateway_common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index ff5ba406b1cf..409d0273c9d1 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -341,23 +341,23 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
         if (atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu <
                 ETH_DATA_LEN + BAT_HEADER_LEN)
                 bat_info(hard_iface->soft_iface,
-                        "The MTU of interface %s is too small (%i) to handle "
-                        "the transport of batman-adv packets. Packets going "
-                        "over this interface will be fragmented on layer2 "
-                        "which could impact the performance. Setting the MTU "
-                        "to %zi would solve the problem.\n",
-                        hard_iface->net_dev->name, hard_iface->net_dev->mtu,
-                        ETH_DATA_LEN + BAT_HEADER_LEN);
+                         "The MTU of interface %s is too small (%i) to handle "
+                         "the transport of batman-adv packets. Packets going "
+                         "over this interface will be fragmented on layer2 "
+                         "which could impact the performance. Setting the MTU "
+                         "to %zi would solve the problem.\n",
+                         hard_iface->net_dev->name, hard_iface->net_dev->mtu,
+                         ETH_DATA_LEN + BAT_HEADER_LEN);
 
         if (!atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu <
                 ETH_DATA_LEN + BAT_HEADER_LEN)
                 bat_info(hard_iface->soft_iface,
-                        "The MTU of interface %s is too small (%i) to handle "
-                        "the transport of batman-adv packets. If you experience"
-                        " problems getting traffic through try increasing the "
-                        "MTU to %zi.\n",
-                        hard_iface->net_dev->name, hard_iface->net_dev->mtu,
-                        ETH_DATA_LEN + BAT_HEADER_LEN);
+                         "The MTU of interface %s is too small (%i) to handle "
+                         "the transport of batman-adv packets. If you "
+                         "experience problems getting traffic through try "
+                         "increasing the MTU to %zi.\n",
+                         hard_iface->net_dev->name, hard_iface->net_dev->mtu,
+                         ETH_DATA_LEN + BAT_HEADER_LEN);
 
         if (hardif_is_iface_up(hard_iface))
                 hardif_activate_interface(hard_iface);
@@ -580,8 +580,8 @@ static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
                 goto err_free;
 
         /* expect a valid ethernet header here. */
-        if (unlikely(skb->mac_len != sizeof(struct ethhdr)
-                                || !skb_mac_header(skb)))
+        if (unlikely(skb->mac_len != sizeof(struct ethhdr) ||
+                     !skb_mac_header(skb)))
                 goto err_free;
 
         if (!hard_iface->soft_iface)
diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h
index 67f78d1a63b4..e68c5655e616 100644
--- a/net/batman-adv/hard-interface.h
+++ b/net/batman-adv/hard-interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c
index d1da29da333b..117687bedf25 100644
--- a/net/batman-adv/hash.c
+++ b/net/batman-adv/hash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich, Marek Lindner
  *
diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h
index 4768717f07f9..d4bd7862719b 100644
--- a/net/batman-adv/hash.h
+++ b/net/batman-adv/hash.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich, Marek Lindner
  *
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index 5d69e103faa1..9b755f9eb182 100644
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h
index 462b190fa101..380ed4c2443a 100644
--- a/net/batman-adv/icmp_socket.h
+++ b/net/batman-adv/icmp_socket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 8ae497b26bd8..08f3b3a8e883 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 586afafb1b67..1468788a9d64 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -28,7 +28,7 @@
 #define DRIVER_DEVICE "batman-adv"
 
 #ifndef SOURCE_VERSION
-#define SOURCE_VERSION "2012.0.0"
+#define SOURCE_VERSION "2012.1.0"
 #endif
 
 /* B.A.T.M.A.N. parameters */
@@ -41,13 +41,14 @@
 
 /* purge originators after time in seconds if no valid packet comes in
  * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */
-#define PURGE_TIMEOUT 200
-#define TT_LOCAL_TIMEOUT 3600 /* in seconds */
-#define TT_CLIENT_ROAM_TIMEOUT 600
+#define PURGE_TIMEOUT 200000 /* 200 seconds */
+#define TT_LOCAL_TIMEOUT 3600000 /* in miliseconds */
+#define TT_CLIENT_ROAM_TIMEOUT 600000 /* in miliseconds */
 /* sliding packet range of received originator messages in sequence numbers
  * (should be a multiple of our word size) */
 #define TQ_LOCAL_WINDOW_SIZE 64
-#define TT_REQUEST_TIMEOUT 3 /* seconds we have to keep pending tt_req */
+#define TT_REQUEST_TIMEOUT 3000 /* miliseconds we have to keep
+                                 * pending tt_req */
 
 #define TQ_GLOBAL_WINDOW_SIZE 5
 #define TQ_LOCAL_BIDRECT_SEND_MINIMUM 1
@@ -56,8 +57,8 @@
 
 #define TT_OGM_APPEND_MAX 3 /* number of OGMs sent with the last tt diff */
 
-#define ROAMING_MAX_TIME 20 /* Time in which a client can roam at most
-                             * ROAMING_MAX_COUNT times */
+#define ROAMING_MAX_TIME 20000 /* Time in which a client can roam at most
+                                * ROAMING_MAX_COUNT times in miliseconds*/
 #define ROAMING_MAX_COUNT 5
 
 #define NO_FLAGS 0
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 847ff7e98a61..371cc93d8e17 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -143,7 +143,7 @@ static void orig_node_free_rcu(struct rcu_head *rcu)
 
         frag_list_free(&orig_node->frag_list);
         tt_global_del_orig(orig_node->bat_priv, orig_node,
-                            "originator timed out");
+                           "originator timed out");
 
         kfree(orig_node->tt_buff);
         kfree(orig_node->bcast_own);
@@ -282,8 +282,7 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv,
         hlist_for_each_entry_safe(neigh_node, node, node_tmp,
                                   &orig_node->neigh_list, list) {
 
-                if ((time_after(jiffies,
-                        neigh_node->last_valid + PURGE_TIMEOUT * HZ)) ||
+                if ((has_timed_out(neigh_node->last_valid, PURGE_TIMEOUT)) ||
                     (neigh_node->if_incoming->if_status == IF_INACTIVE) ||
                     (neigh_node->if_incoming->if_status == IF_NOT_IN_USE) ||
                     (neigh_node->if_incoming->if_status == IF_TO_BE_REMOVED)) {
@@ -327,18 +326,15 @@ static bool purge_orig_node(struct bat_priv *bat_priv,
 {
         struct neigh_node *best_neigh_node;
 
-        if (time_after(jiffies,
-                orig_node->last_valid + 2 * PURGE_TIMEOUT * HZ)) {
-
+        if (has_timed_out(orig_node->last_valid, 2 * PURGE_TIMEOUT)) {
                 bat_dbg(DBG_BATMAN, bat_priv,
                         "Originator timeout: originator %pM, last_valid %lu\n",
                         orig_node->orig, (orig_node->last_valid / HZ));
                 return true;
         } else {
                 if (purge_orig_neighbors(bat_priv, orig_node,
-                                                        &best_neigh_node)) {
+                                         &best_neigh_node))
                         update_route(bat_priv, orig_node, best_neigh_node);
-                }
         }
 
         return false;
@@ -372,8 +368,8 @@ static void _purge_orig(struct bat_priv *bat_priv)
                                 continue;
                         }
 
-                        if (time_after(jiffies, orig_node->last_frag_packet +
-                                                msecs_to_jiffies(FRAG_TIMEOUT)))
+                        if (has_timed_out(orig_node->last_frag_packet,
+                                          FRAG_TIMEOUT))
                                 frag_list_free(&orig_node->frag_list);
                 }
                 spin_unlock_bh(list_lock);
diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h
index 67765ffef731..3fe2eda85652 100644
--- a/net/batman-adv/originator.h
+++ b/net/batman-adv/originator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index 88c717b9344d..441f3db1bd91 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
diff --git a/net/batman-adv/ring_buffer.c b/net/batman-adv/ring_buffer.c
index f1ccfa76ce8a..fd63951d118d 100644
--- a/net/batman-adv/ring_buffer.c
+++ b/net/batman-adv/ring_buffer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
diff --git a/net/batman-adv/ring_buffer.h b/net/batman-adv/ring_buffer.h
index 7cdfe62b657c..8b58bd82767d 100644
--- a/net/batman-adv/ring_buffer.h
+++ b/net/batman-adv/ring_buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index b72d7f3b3c6a..f53515562a4f 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -72,7 +72,7 @@ static void _update_route(struct bat_priv *bat_priv,
                 bat_dbg(DBG_ROUTES, bat_priv, "Deleting route towards: %pM\n",
                         orig_node->orig);
                 tt_global_del_orig(bat_priv, orig_node,
-                                    "Deleted route towards originator");
+                                   "Deleted route towards originator");
 
         /* route added */
         } else if ((!curr_router) && (neigh_node)) {
@@ -229,10 +229,9 @@ void bonding_save_primary(const struct orig_node *orig_node,
 int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff,
                      unsigned long *last_reset)
 {
-        if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE)
-                || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
-                if (time_after(jiffies, *last_reset +
-                        msecs_to_jiffies(RESET_PROTECTION_MS))) {
+        if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) ||
+            (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
+                if (has_timed_out(*last_reset, RESET_PROTECTION_MS)) {
 
                         *last_reset = jiffies;
                         bat_dbg(DBG_BATMAN, bat_priv,
@@ -430,7 +429,7 @@ int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if)
         if ((hdr_size == sizeof(struct icmp_packet_rr)) &&
             (icmp_packet->rr_cur < BAT_RR_LEN)) {
                 memcpy(&(icmp_packet->rr[icmp_packet->rr_cur]),
-                        ethhdr->h_dest, ETH_ALEN);
+                       ethhdr->h_dest, ETH_ALEN);
                 icmp_packet->rr_cur++;
         }
 
diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h
index 7aaee0fb0fdc..92ac100d83da 100644
--- a/net/batman-adv/routing.h
+++ b/net/batman-adv/routing.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index 019337e3eafb..413758065323 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h
index c8ca3ef7385b..824ef06f9b01 100644
--- a/net/batman-adv/send.h
+++ b/net/batman-adv/send.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 2d8bd2ad6ba3..8fb16d209fd9 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -396,8 +396,8 @@ void softif_neigh_purge(struct bat_priv *bat_priv)
                 hlist_for_each_entry_safe(softif_neigh, node_tmp, node_tmp2,
                                           &softif_neigh_vid->softif_neigh_list,
                                           list) {
-                        if ((!time_after(jiffies, softif_neigh->last_seen +
-                                msecs_to_jiffies(SOFTIF_NEIGH_TIMEOUT))) &&
+                        if ((!has_timed_out(softif_neigh->last_seen,
+                                            SOFTIF_NEIGH_TIMEOUT)) &&
                             (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE))
                                 continue;
 
diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h
index 001546fc96f1..756eab5b8dd4 100644
--- a/net/batman-adv/soft-interface.h
+++ b/net/batman-adv/soft-interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  *
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index a84e80409f9b..c9507057c98e 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -210,6 +210,11 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
         if (compare_eth(addr, soft_iface->dev_addr))
                 tt_local_entry->common.flags |= 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_entry->common.flags |= TT_CLIENT_NEW;
+
         hash_added = hash_add(bat_priv->tt_local_hash, compare_tt, choose_orig,
                          &tt_local_entry->common,
                          &tt_local_entry->common.hash_entry);
@@ -222,11 +227,6 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr,
 
         tt_local_event(bat_priv, addr, tt_local_entry->common.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_entry->common.flags |= TT_CLIENT_NEW;
-
         /* remove address from global hash if present */
         tt_global_entry = tt_global_hash_find(bat_priv, addr);
 
@@ -261,7 +261,7 @@ int tt_changes_fill_buffer(struct bat_priv *bat_priv,
         atomic_set(&bat_priv->tt_local_changes, 0);
 
         list_for_each_entry_safe(entry, safe, &bat_priv->tt_changes_list,
-                        list) {
+                                 list) {
                 if (count < tot_changes) {
                         memcpy(buff + tt_len(count),
                                &entry->change, sizeof(struct tt_change));
@@ -333,17 +333,17 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset)
                 hlist_for_each_entry_rcu(tt_common_entry, node,
                                          head, hash_entry) {
                         seq_printf(seq, " * %pM [%c%c%c%c%c]\n",
-                                        tt_common_entry->addr,
-                                        (tt_common_entry->flags &
-                                         TT_CLIENT_ROAM ? 'R' : '.'),
-                                        (tt_common_entry->flags &
-                                         TT_CLIENT_NOPURGE ? 'P' : '.'),
-                                        (tt_common_entry->flags &
-                                         TT_CLIENT_NEW ? 'N' : '.'),
-                                        (tt_common_entry->flags &
-                                         TT_CLIENT_PENDING ? 'X' : '.'),
-                                        (tt_common_entry->flags &
-                                         TT_CLIENT_WIFI ? 'W' : '.'));
+                                   tt_common_entry->addr,
+                                   (tt_common_entry->flags &
+                                    TT_CLIENT_ROAM ? 'R' : '.'),
+                                   (tt_common_entry->flags &
+                                    TT_CLIENT_NOPURGE ? 'P' : '.'),
+                                   (tt_common_entry->flags &
+                                    TT_CLIENT_NEW ? 'N' : '.'),
+                                   (tt_common_entry->flags &
+                                    TT_CLIENT_PENDING ? 'X' : '.'),
+                                   (tt_common_entry->flags &
+                                    TT_CLIENT_WIFI ? 'W' : '.'));
                 }
                 rcu_read_unlock();
         }
@@ -355,7 +355,7 @@ out:
 
 static void tt_local_set_pending(struct bat_priv *bat_priv,
                                  struct tt_local_entry *tt_local_entry,
-                                 uint16_t flags)
+                                 uint16_t flags, const char *message)
 {
         tt_local_event(bat_priv, tt_local_entry->common.addr,
                        tt_local_entry->common.flags | flags);
@@ -364,6 +364,9 @@ static void tt_local_set_pending(struct bat_priv *bat_priv,
          * to be kept in the table in order to send it in a full table
          * response issued before the net ttvn increment (consistency check) */
         tt_local_entry->common.flags |= TT_CLIENT_PENDING;
+
+        bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) pending to be removed: "
+                "%s\n", tt_local_entry->common.addr, message);
 }
 
 void tt_local_remove(struct bat_priv *bat_priv, const uint8_t *addr,
@@ -376,10 +379,7 @@ void tt_local_remove(struct bat_priv *bat_priv, const uint8_t *addr,
                 goto out;
 
         tt_local_set_pending(bat_priv, tt_local_entry, TT_CLIENT_DEL |
-                             (roaming ? TT_CLIENT_ROAM : NO_FLAGS));
-
-        bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) pending to be removed: "
-                "%s\n", tt_local_entry->common.addr, message);
+                             (roaming ? TT_CLIENT_ROAM : NO_FLAGS), message);
 out:
         if (tt_local_entry)
                 tt_local_entry_free_ref(tt_local_entry);
@@ -413,14 +413,11 @@ static void tt_local_purge(struct bat_priv *bat_priv)
                                 continue;
 
                         if (!has_timed_out(tt_local_entry->last_seen,
-                                           TT_LOCAL_TIMEOUT * 1000))
+                                           TT_LOCAL_TIMEOUT))
                                 continue;
 
                         tt_local_set_pending(bat_priv, tt_local_entry,
-                                             TT_CLIENT_DEL);
-                        bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) "
-                                "pending to be removed: timed out\n",
-                                tt_local_entry->common.addr);
+                                             TT_CLIENT_DEL, "timed out");
                 }
                 spin_unlock_bh(list_lock);
         }
@@ -606,7 +603,7 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset)
                                                        struct tt_global_entry,
                                                        common);
                         seq_printf(seq, " * %pM  (%3u) via %pM     (%3u)   "
-                                        "[%c%c%c]\n",
+                                        "[%c%c]\n",
                                         tt_global_entry->common.addr,
                                         tt_global_entry->ttvn,
                                         tt_global_entry->orig_node->orig,
@@ -616,8 +613,6 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset)
                                         (tt_global_entry->common.flags &
                                          TT_CLIENT_ROAM ? 'R' : '.'),
                                         (tt_global_entry->common.flags &
-                                         TT_CLIENT_PENDING ? 'X' : '.'),
-                                        (tt_global_entry->common.flags &
                                          TT_CLIENT_WIFI ? 'W' : '.'));
                 }
                 rcu_read_unlock();
@@ -657,29 +652,31 @@ void tt_global_del(struct bat_priv *bat_priv,
         struct tt_local_entry *tt_local_entry = NULL;
 
         tt_global_entry = tt_global_hash_find(bat_priv, addr);
-        if (!tt_global_entry)
+        if (!tt_global_entry || tt_global_entry->orig_node != orig_node)
                 goto out;
 
-        if (tt_global_entry->orig_node == orig_node) {
-                if (roaming) {
-                        /* if we are deleting a global entry due to a roam
-                         * event, there are two possibilities:
-                         * 1) the client roamed from node A to node B => we mark
-                         *    it with TT_CLIENT_ROAM, we start a timer and we
-                         *    wait for node B to claim it. In case of timeout
-                         *    the entry is purged.
-                         * 2) the client roamed to us => we can directly delete
-                         *    the global entry, since it is useless now. */
-                        tt_local_entry = tt_local_hash_find(bat_priv,
-                                                            tt_global_entry->common.addr);
-                        if (!tt_local_entry) {
-                                tt_global_entry->common.flags |= TT_CLIENT_ROAM;
-                                tt_global_entry->roam_at = jiffies;
-                                goto out;
-                        }
-                }
-                _tt_global_del(bat_priv, tt_global_entry, message);
+        if (!roaming)
+                goto out_del;
+
+        /* if we are deleting a global entry due to a roam
+         * event, there are two possibilities:
+         * 1) the client roamed from node A to node B => we mark
+         *    it with TT_CLIENT_ROAM, we start a timer and we
+         *    wait for node B to claim it. In case of timeout
+         *    the entry is purged.
+         * 2) the client roamed to us => we can directly delete
+         *    the global entry, since it is useless now. */
+        tt_local_entry = tt_local_hash_find(bat_priv,
+                                            tt_global_entry->common.addr);
+        if (!tt_local_entry) {
+                tt_global_entry->common.flags |= TT_CLIENT_ROAM;
+                tt_global_entry->roam_at = jiffies;
+                goto out;
         }
+
+out_del:
+        _tt_global_del(bat_priv, tt_global_entry, message);
+
 out:
         if (tt_global_entry)
                 tt_global_entry_free_ref(tt_global_entry);
@@ -707,7 +704,7 @@ void tt_global_del_orig(struct bat_priv *bat_priv,
 
                 spin_lock_bh(list_lock);
                 hlist_for_each_entry_safe(tt_common_entry, node, safe,
-                                         head, hash_entry) {
+                                          head, hash_entry) {
                         tt_global_entry = container_of(tt_common_entry,
                                                        struct tt_global_entry,
                                                        common);
@@ -751,7 +748,7 @@ static void tt_global_roam_purge(struct bat_priv *bat_priv)
                         if (!(tt_global_entry->common.flags & TT_CLIENT_ROAM))
                                 continue;
                         if (!has_timed_out(tt_global_entry->roam_at,
-                                           TT_CLIENT_ROAM_TIMEOUT * 1000))
+                                           TT_CLIENT_ROAM_TIMEOUT))
                                 continue;
 
                         bat_dbg(DBG_TT, bat_priv, "Deleting global "
@@ -839,11 +836,6 @@ struct orig_node *transtable_search(struct bat_priv *bat_priv,
         if (!atomic_inc_not_zero(&tt_global_entry->orig_node->refcount))
                 goto out;
 
-        /* A global client marked as PENDING has already moved from that
-         * originator */
-        if (tt_global_entry->common.flags & TT_CLIENT_PENDING)
-                goto out;
-
         orig_node = tt_global_entry->orig_node;
 
 out:
@@ -970,8 +962,7 @@ static void tt_req_purge(struct bat_priv *bat_priv)
 
         spin_lock_bh(&bat_priv->tt_req_list_lock);
         list_for_each_entry_safe(node, safe, &bat_priv->tt_req_list, list) {
-                if (has_timed_out(node->issued_at,
-                                  TT_REQUEST_TIMEOUT * 1000)) {
+                if (has_timed_out(node->issued_at, TT_REQUEST_TIMEOUT)) {
                         list_del(&node->list);
                         kfree(node);
                 }
@@ -990,7 +981,7 @@ static struct tt_req_node *new_tt_req_node(struct bat_priv *bat_priv,
         list_for_each_entry(tt_req_node_tmp, &bat_priv->tt_req_list, list) {
                 if (compare_eth(tt_req_node_tmp, orig_node) &&
                     !has_timed_out(tt_req_node_tmp->issued_at,
-                                   TT_REQUEST_TIMEOUT * 1000))
+                                   TT_REQUEST_TIMEOUT))
                         goto unlock;
         }
 
@@ -1583,8 +1574,7 @@ static void tt_roam_purge(struct bat_priv *bat_priv)
 
         spin_lock_bh(&bat_priv->tt_roam_list_lock);
         list_for_each_entry_safe(node, safe, &bat_priv->tt_roam_list, list) {
-                if (!has_timed_out(node->first_time,
-                                   ROAMING_MAX_TIME * 1000))
+                if (!has_timed_out(node->first_time, ROAMING_MAX_TIME))
                         continue;
 
                 list_del(&node->list);
@@ -1611,8 +1601,7 @@ static bool tt_check_roam_count(struct bat_priv *bat_priv,
                 if (!compare_eth(tt_roam_node->addr, client))
                         continue;
 
-                if (has_timed_out(tt_roam_node->first_time,
-                                  ROAMING_MAX_TIME * 1000))
+                if (has_timed_out(tt_roam_node->first_time, ROAMING_MAX_TIME))
                         continue;
 
                 if (!atomic_dec_not_zero(&tt_roam_node->counter))
diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h
index 30efd49881a3..c753633b1da1 100644
--- a/net/batman-adv/translation-table.h
+++ b/net/batman-adv/translation-table.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 650ce5fb1192..302efb523475 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index 6f3c65952f53..0897dfa72c59 100644
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
  *
  * Andreas Langer
  *
diff --git a/net/batman-adv/unicast.h b/net/batman-adv/unicast.h
index 8fd5535544b9..a9faf6b1db19 100644
--- a/net/batman-adv/unicast.h
+++ b/net/batman-adv/unicast.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
  *
  * Andreas Langer
  *
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index ac7e66100590..c4a5b8cafada 100644
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2008-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich
  *
@@ -714,8 +714,7 @@ static void purge_vis_packets(struct bat_priv *bat_priv)
                         if (info == bat_priv->my_vis_info)
                                 continue;
 
-                        if (time_after(jiffies,
-                                       info->first_seen + VIS_TIMEOUT * HZ)) {
+                        if (has_timed_out(info->first_seen, VIS_TIMEOUT)) {
                                 hlist_del(node);
                                 send_list_del(info);
                                 kref_put(&info->refcount, free_info);
diff --git a/net/batman-adv/vis.h b/net/batman-adv/vis.h
index 31b820d07f23..ee2e46e5347b 100644
--- a/net/batman-adv/vis.h
+++ b/net/batman-adv/vis.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2011 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2008-2012 B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich, Marek Lindner
  *
@@ -22,7 +22,8 @@
 #ifndef _NET_BATMAN_ADV_VIS_H_
 #define _NET_BATMAN_ADV_VIS_H_
 
-#define VIS_TIMEOUT             200     /* timeout of vis packets in seconds */
+#define VIS_TIMEOUT             200000  /* timeout of vis packets
+                                         * in miliseconds */
 
 int vis_seq_print_text(struct seq_file *seq, void *offset);
 void receive_server_sync_packet(struct bat_priv *bat_priv,