The following commit has been merged in the master branch: commit a7966d908ae8472e8183496916b7baec5f65b3a6 Author: Antonio Quartulli ordex@autistici.org Date: Thu Jan 24 11:41:39 2013 +0100

batman-adv: fix local translation table output

The last-seen field has to be printed for all the local entries but the one marked with the no-purge flag

Introduced by 15727323d9f8864b2d41930940acc38de987045a ("batman-adv: don't print the last_seen time for bat0 TT local entry")

Signed-off-by: Antonio Quartulli ordex@autistici.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index fb15b4c..d44672f 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -517,8 +517,8 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) BATADV_TT_CLIENT_PENDING ? 'X' : '.'), (tt_common_entry->flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), - no_purge ? last_seen_secs : 0, - no_purge ? last_seen_msecs : 0); + no_purge ? 0 : last_seen_secs, + no_purge ? 0 : last_seen_msecs); } rcu_read_unlock(); }