The following commit has been merged in the merge/master branch:
commit f8fa1cfa343d5ec4b38760c3051cdd8a3a454005
Author: Antonio Quartulli <a(a)unstable.cc>
Date: Wed May 25 23:27:33 2016 +0800
batman-adv: statically print gateway table header
To make it easier to search through the code it is better to print static
strings directly instead of using format strings printing constants.
This was addressed in a previous patch, but the Gateway table header
was not updated accordingly.
Signed-off-by: Antonio Quartulli <a(a)unstable.cc>
Reviewed-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index e108d45..63a805d 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -639,8 +639,7 @@ int batadv_gw_client_seq_print_text(struct seq_file *seq, void
*offset)
goto out;
seq_printf(seq,
- " %-12s (%s/%i) %17s [%10s]: advertised uplink bandwidth ... [B.A.T.M.A.N.
adv %s, MainIF/MAC: %s/%pM (%s)]\n",
- "Gateway", "#", BATADV_TQ_MAX_VALUE, "Nexthop",
"outgoingIF",
+ " Gateway (#/255) Nexthop [outgoingIF]: advertised uplink
bandwidth ... [B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",
BATADV_SOURCE_VERSION, primary_if->net_dev->name,
primary_if->net_dev->dev_addr, net_dev->name);
--
linux integration
Show replies by date