diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-29 15:59:45 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-29 15:59:45 -0500 |
| commit | b53c47dd4fdb3f062c07b1ba8a7f9f80237be182 (patch) | |
| tree | f34f3c260c2f089f0ed89faeddba43771fd21694 | |
| parent | f1e7b73acc26e8908af783bcd3a9900fd80688f5 (diff) | |
| parent | a7966d908ae8472e8183496916b7baec5f65b3a6 (diff) | |
| download | linux-b53c47dd4fdb3f062c07b1ba8a7f9f80237be182.tar.bz2 | |
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>
| -rw-r--r-- | net/batman-adv/translation-table.c | 4 |
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) 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(); } |