]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
batman-adv: TT_CLIENT_PENDING is never set in struct tt_global_entry
authorAntonio Quartulli <ordex@autistici.org>
Thu, 12 Jan 2012 18:07:00 +0000 (19:07 +0100)
committerMarek Lindner <lindner_marek@yahoo.de>
Thu, 16 Feb 2012 18:50:21 +0000 (02:50 +0800)
Actually the TT_CLIENT_PENDING flag is never set in the tt_global_entry
structure, therefore this code is useless and can be removed.

Reported-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
net/batman-adv/translation-table.c

index 1ff7fbebf92141b27a39c69723df8cd0838d8e53..9a6f315b7d44ba9b6881d72c372b52859617cc51 100644 (file)
@@ -603,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,
@@ -612,8 +612,6 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset)
                                                last_ttvn),
                                        (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' : '.'));
                }
@@ -838,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: