diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-06 04:45:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-06 04:45:12 +0200 |
| commit | f8bae99ee5030625a4e7f0d87784191882292f0e (patch) | |
| tree | 991cd2aff1ec1b74d1e3c658eb2ea09b0f93e5bd /net/batman-adv/originator.c | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| parent | batman-adv: Replace version info instead of appending them (diff) | |
| download | linux-f8bae99ee5030625a4e7f0d87784191882292f0e.tar.xz linux-f8bae99ee5030625a4e7f0d87784191882292f0e.zip | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/originator.c')
| -rw-r--r-- | net/batman-adv/originator.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 338b3c597e4a..4cc94d4ba890 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -430,9 +430,8 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) goto out; } - seq_printf(seq, "[B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%pM (%s)]\n", - SOURCE_VERSION, REVISION_VERSION_STR, - primary_if->net_dev->name, + seq_printf(seq, "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n", + SOURCE_VERSION, primary_if->net_dev->name, primary_if->net_dev->dev_addr, net_dev->name); seq_printf(seq, " %-15s %s (%s/%i) %17s [%10s]: %20s ...\n", "Originator", "last-seen", "#", TQ_MAX_VALUE, "Nexthop", |