Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 290493
b: refs/heads/master
c: 78d6942
h: refs/heads/master
i:
  290491: b1112ce
v: v3
  • Loading branch information
Antonio Quartulli authored and Marek Lindner committed Feb 16, 2012
1 parent 0498398 commit 0ade77e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c566dbbef029d7ea957e9566e3073e68b9e05de9
refs/heads/master: 78d6942a45f86126ebdadd45418188b221d63344
9 changes: 1 addition & 8 deletions trunk/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 0ade77e

Please sign in to comment.