aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-01-29 15:59:45 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-29 15:59:45 -0500
commitb53c47dd4fdb3f062c07b1ba8a7f9f80237be182 (patch)
treef34f3c260c2f089f0ed89faeddba43771fd21694 /net/batman-adv
parentf1e7b73acc26e8908af783bcd3a9900fd80688f5 (diff)
parenta7966d908ae8472e8183496916b7baec5f65b3a6 (diff)
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes: - fix recently introduced output behaviour Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/translation-table.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index fb15b4c076f7..d44672f4a349 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)
517 BATADV_TT_CLIENT_PENDING ? 'X' : '.'), 517 BATADV_TT_CLIENT_PENDING ? 'X' : '.'),
518 (tt_common_entry->flags & 518 (tt_common_entry->flags &
519 BATADV_TT_CLIENT_WIFI ? 'W' : '.'), 519 BATADV_TT_CLIENT_WIFI ? 'W' : '.'),
520 no_purge ? last_seen_secs : 0, 520 no_purge ? 0 : last_seen_secs,
521 no_purge ? last_seen_msecs : 0); 521 no_purge ? 0 : last_seen_msecs);
522 } 522 }
523 rcu_read_unlock(); 523 rcu_read_unlock();
524 } 524 }