diff options
-rw-r--r-- | net/batman-adv/translation-table.c | 9 |
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 | ||
848 | out: | 841 | out: |