aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorAntonio Quartulli <ordex@autistici.org>2012-01-12 13:07:00 -0500
committerMarek Lindner <lindner_marek@yahoo.de>2012-02-16 13:50:21 -0500
commit78d6942a45f86126ebdadd45418188b221d63344 (patch)
treefc59299d2a9bb7d0bde7381f5f08290d30c13142 /net/batman-adv
parentc566dbbef029d7ea957e9566e3073e68b9e05de9 (diff)
batman-adv: TT_CLIENT_PENDING is never set in struct tt_global_entry
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>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/translation-table.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 1ff7fbebf921..9a6f315b7d44 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -603,7 +603,7 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset)
603 struct tt_global_entry, 603 struct tt_global_entry,
604 common); 604 common);
605 seq_printf(seq, " * %pM (%3u) via %pM (%3u) " 605 seq_printf(seq, " * %pM (%3u) via %pM (%3u) "
606 "[%c%c%c]\n", 606 "[%c%c]\n",
607 tt_global_entry->common.addr, 607 tt_global_entry->common.addr,
608 tt_global_entry->ttvn, 608 tt_global_entry->ttvn,
609 tt_global_entry->orig_node->orig, 609 tt_global_entry->orig_node->orig,
@@ -613,8 +613,6 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset)
613 (tt_global_entry->common.flags & 613 (tt_global_entry->common.flags &
614 TT_CLIENT_ROAM ? 'R' : '.'), 614 TT_CLIENT_ROAM ? 'R' : '.'),
615 (tt_global_entry->common.flags & 615 (tt_global_entry->common.flags &
616 TT_CLIENT_PENDING ? 'X' : '.'),
617 (tt_global_entry->common.flags &
618 TT_CLIENT_WIFI ? 'W' : '.')); 616 TT_CLIENT_WIFI ? 'W' : '.'));
619 } 617 }
620 rcu_read_unlock(); 618 rcu_read_unlock();
@@ -838,11 +836,6 @@ struct orig_node *transtable_search(struct bat_priv *bat_priv,
838 if (!atomic_inc_not_zero(&tt_global_entry->orig_node->refcount)) 836 if (!atomic_inc_not_zero(&tt_global_entry->orig_node->refcount))
839 goto out; 837 goto out;
840 838
841 /* A global client marked as PENDING has already moved from that
842 * originator */
843 if (tt_global_entry->common.flags & TT_CLIENT_PENDING)
844 goto out;
845
846 orig_node = tt_global_entry->orig_node; 839 orig_node = tt_global_entry->orig_node;
847 840
848out: 841out: