Skip to content

Commit

Permalink
batman-adv: TT_CLIENT_PENDING is never set in struct tt_global_entry
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Antonio Quartulli authored and Marek Lindner committed Feb 16, 2012
1 parent c566dbb commit 78d6942
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions net/batman-adv/translation-table.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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' : '.'));
}
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 78d6942

Please sign in to comment.