B.A.T.M.A.N

b.a.t.m.a.n@lists.open-mesh.org

15 participants
4308 discussions

[B.A.T.M.A.N.] no able to switch routing algo to V ?
by contact 07 May '16

07 May '16

Hello, I just got openwrt 15.05.1 with batman-adv 2016.1 on 3 picostation HP, this time a selected before the build of openwrt batman V option, I can see it when it ask for available routing algo , root@OpenWrt:/etc/init.d# cat /sys/kernel/debug/batman_adv/routing_algos Available routing algorithms: * BATMAN_IV * BATMAN_V but when I do : echo BATMAN_V > /sys/module/batman_adv/parameters/routing_algo It does nothing, still on BATMAN_IV during session and on reboot ? sysctl -a does not show any routing_algoritms param for batman-adv ? Best Regards, Laurent

3 14

[B.A.T.M.A.N.] [PATCH maint] batman-adv: Add missing include for batadv_v_neigh_is_sob
by Sven Eckelmann 07 May '16

07 May '16

batadv_v_neigh_is_sob started to use false which is defined in linux/stddef.h. Fixes: 036aa7b7181e ("batman-adv: Avoid nullptr derefence in batadv_v_neigh_is_sob") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/bat_v.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 2bcb29b..5b30a11 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -27,6 +27,7 @@ #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/seq_file.h> +#include <linux/stddef.h> #include <linux/types.h> #include <linux/workqueue.h>

2 1

[B.A.T.M.A.N.] [PATCH maint] batman-adv: Fix double neigh_node_put in batadv_v_ogm_route_update
by Sven Eckelmann 07 May '16

07 May '16

The router is put down twice when it was non-NULL and either orig_ifinfo is NULL afterwards or batman-adv receives a packet with the same sequence number. This will end up in a use-after-free when the batadv_neigh_node is removed because the reference counter ended up too early at 0. Fixes: 667996ebeab4 ("batman-adv: OGMv2 - implement originators logic") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- It looks like this bug was solved in next/master by refactoring in 30c96bc7870f ("batman-adv: move and restructure batadv_v_ogm_forward") only compile tested. Please add so many reported by as you want - just don't know it it is *the* bug and who actually reported it. --- net/batman-adv/bat_v_ogm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index d9bcbe6..91df28a 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -529,8 +529,10 @@ static void batadv_v_ogm_route_update(struct batadv_priv *bat_priv, goto out; } - if (router) + if (router) { batadv_neigh_node_put(router); + router = NULL; + } /* Update routes, and check if the OGM is from the best next hop */ batadv_v_ogm_orig_update(bat_priv, orig_node, neigh_node, ogm2, -- 2.8.1

4 6

[B.A.T.M.A.N.] [PATCHv2 maint] batman-adv: initialize ELP orig address on secondary interfaces
by Marek Lindner 07 May '16

07 May '16

This fix prevents nodes to wrongly create a 00:00:00:00:00:00 originator which can potentially interfere with the rest of the neighbor statistics. Fixes: a4b88af77e28 ("batman-adv: ELP - adding basic infrastructure") Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> --- net/batman-adv/bat_v.c | 10 ++++++++++ net/batman-adv/bat_v_elp.c | 31 ++++++++++++++++++++++--------- net/batman-adv/bat_v_elp.h | 2 ++ 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 2bcb29b..0caca2f 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -39,6 +39,16 @@ static void batadv_v_iface_activate(struct batadv_hard_iface *hard_iface) { + struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); + struct batadv_hard_iface *primary_if; + + primary_if = batadv_primary_if_get_selected(bat_priv); + + if (primary_if) { + batadv_v_elp_iface_activate(primary_if, hard_iface); + batadv_hardif_put(primary_if); + } + /* B.A.T.M.A.N. V does not use any queuing mechanism, therefore it can * set the interface as ACTIVE right away, without any risk of race * condition diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 3844e7e..df42eb1 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -377,6 +377,27 @@ void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface) } /** + * batadv_v_elp_iface_activate - update the ELP buffer belonging to the given + * hard-interface + * @primary_iface: the new primary interface + * @hard_iface: interface holding the to-be-updated buffer + */ +void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface, + struct batadv_hard_iface *hard_iface) +{ + struct batadv_elp_packet *elp_packet; + struct sk_buff *skb; + + if (!hard_iface->bat_v.elp_skb) + return; + + skb = hard_iface->bat_v.elp_skb; + elp_packet = (struct batadv_elp_packet *)skb->data; + ether_addr_copy(elp_packet->orig, + primary_iface->net_dev->dev_addr); +} + +/** * batadv_v_elp_primary_iface_set - change internal data to reflect the new * primary interface * @primary_iface: the new primary interface @@ -384,8 +405,6 @@ void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface) void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface) { struct batadv_hard_iface *hard_iface; - struct batadv_elp_packet *elp_packet; - struct sk_buff *skb; /* update orig field of every elp iface belonging to this mesh */ rcu_read_lock(); @@ -393,13 +412,7 @@ void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface) if (primary_iface->soft_iface != hard_iface->soft_iface) continue; - if (!hard_iface->bat_v.elp_skb) - continue; - - skb = hard_iface->bat_v.elp_skb; - elp_packet = (struct batadv_elp_packet *)skb->data; - ether_addr_copy(elp_packet->orig, - primary_iface->net_dev->dev_addr); + batadv_v_elp_iface_activate(primary_iface, hard_iface); } rcu_read_unlock(); } diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h index e95f1bc..cc130b2 100644 --- a/net/batman-adv/bat_v_elp.h +++ b/net/batman-adv/bat_v_elp.h @@ -25,6 +25,8 @@ struct work_struct; int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface); void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface); +void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface, + struct batadv_hard_iface *hard_iface); void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface); int batadv_v_elp_packet_recv(struct sk_buff *skb, struct batadv_hard_iface *if_incoming); -- 2.8.0.rc3

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: initialize ELP orig address on secondary interfaces
by Marek Lindner 07 May '16

07 May '16

Fixes: a4b88af77e28 ("batman-adv: ELP - adding basic infrastructure") Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> --- net/batman-adv/bat_v.c | 10 ++++++++++ net/batman-adv/bat_v_elp.c | 31 ++++++++++++++++++++++--------- net/batman-adv/bat_v_elp.h | 2 ++ 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 2bcb29b..0caca2f 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -39,6 +39,16 @@ static void batadv_v_iface_activate(struct batadv_hard_iface *hard_iface) { + struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); + struct batadv_hard_iface *primary_if; + + primary_if = batadv_primary_if_get_selected(bat_priv); + + if (primary_if) { + batadv_v_elp_iface_activate(primary_if, hard_iface); + batadv_hardif_put(primary_if); + } + /* B.A.T.M.A.N. V does not use any queuing mechanism, therefore it can * set the interface as ACTIVE right away, without any risk of race * condition diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 3844e7e..df42eb1 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -377,6 +377,27 @@ void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface) } /** + * batadv_v_elp_iface_activate - update the ELP buffer belonging to the given + * hard-interface + * @primary_iface: the new primary interface + * @hard_iface: interface holding the to-be-updated buffer + */ +void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface, + struct batadv_hard_iface *hard_iface) +{ + struct batadv_elp_packet *elp_packet; + struct sk_buff *skb; + + if (!hard_iface->bat_v.elp_skb) + return; + + skb = hard_iface->bat_v.elp_skb; + elp_packet = (struct batadv_elp_packet *)skb->data; + ether_addr_copy(elp_packet->orig, + primary_iface->net_dev->dev_addr); +} + +/** * batadv_v_elp_primary_iface_set - change internal data to reflect the new * primary interface * @primary_iface: the new primary interface @@ -384,8 +405,6 @@ void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface) void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface) { struct batadv_hard_iface *hard_iface; - struct batadv_elp_packet *elp_packet; - struct sk_buff *skb; /* update orig field of every elp iface belonging to this mesh */ rcu_read_lock(); @@ -393,13 +412,7 @@ void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface) if (primary_iface->soft_iface != hard_iface->soft_iface) continue; - if (!hard_iface->bat_v.elp_skb) - continue; - - skb = hard_iface->bat_v.elp_skb; - elp_packet = (struct batadv_elp_packet *)skb->data; - ether_addr_copy(elp_packet->orig, - primary_iface->net_dev->dev_addr); + batadv_v_elp_iface_activate(primary_iface, hard_iface); } rcu_read_unlock(); } diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h index e95f1bc..cc130b2 100644 --- a/net/batman-adv/bat_v_elp.h +++ b/net/batman-adv/bat_v_elp.h @@ -25,6 +25,8 @@ struct work_struct; int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface); void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface); +void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface, + struct batadv_hard_iface *hard_iface); void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface); int batadv_v_elp_packet_recv(struct sk_buff *skb, struct batadv_hard_iface *if_incoming); -- 2.8.0.rc3

1 0

[B.A.T.M.A.N.] Kernel panic by BATMAN_V @WBMv9
by Linus Lüssing 06 May '16

06 May '16

Just dumping this here, got a plane to catch. Guido can explain how you can trigger this. Cheers, Linus

3 2

[B.A.T.M.A.N.] [PATCH v2 1/2] batman-adv: Avoid nullptr derefence in batadv_v_neigh_is_sob
by Sven Eckelmann 06 May '16

06 May '16

batadv_neigh_ifinfo_get can return NULL when it cannot find (even when only temporarily) anymore the neigh_ifinfo in the list neigh->ifinfo_list. This has to be checked to avoid kernel Oopses when the ifinfo is dereferenced. This a situation which isn't expected but is already handled by functions like batadv_v_neigh_cmp. The same kind of warning is therefore used before the function returns without dereferencing the pointers. Fixes: b05bbab5e1fc ("batman-adv: B.A.T.M.A.N. V - implement neighbor comparison API calls") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: Add patch to reduce the reference counter of these functions net/batman-adv/bat_v.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 927d405..f271ae8 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -286,6 +286,9 @@ static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1, ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1); ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2); + if (WARN_ON(!ifinfo1 || !ifinfo2)) + return false; + threshold = ifinfo1->bat_v.throughput / 4; threshold = ifinfo1->bat_v.throughput - threshold; -- 2.8.1

2 4

[B.A.T.M.A.N.] [PATCH] batman-adv: Avoid nullptr derefence in batadv_v_neigh_is_sob
by Sven Eckelmann 06 May '16

06 May '16

batadv_neigh_ifinfo_get can return NULL when it cannot find (even when only temporarily) anymore the neigh_ifinfo in the list neigh->ifinfo_list. This has to be checked to avoid kernel Oopses when the ifinfo is dereferenced. This a situation which isn't expected but is already handled by functions like batadv_v_neigh_cmp. The same kind of warning is therefore used before the function returns without dereferencing the pointers. Fixes: b05bbab5e1fc ("batman-adv: B.A.T.M.A.N. V - implement neighbor comparison API calls") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/bat_v.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 927d405..f271ae8 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -286,6 +286,9 @@ static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1, ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1); ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2); + if (WARN_ON(!ifinfo1 || !ifinfo2)) + return false; + threshold = ifinfo1->bat_v.throughput / 4; threshold = ifinfo1->bat_v.throughput - threshold; -- 2.8.1

1 1

[B.A.T.M.A.N.] Batman-adv doesn't compile in openwrt after last commit
by Gio 05 May '16

05 May '16

Hi! I get this error after last commit on openwrt routing feed evelop/staging_dir/target- mips_34kc_uClibc-0.9.33.2/pkginfo/alfred.default.install /home/gioacchino/public_html/openwrt/lime- build/build/develop/staging_dir/target- mips_34kc_uClibc-0.9.33.2/pkginfo/alfred.default.install.clean; fi; echo "alfred" >> /home/gioacchino/public_html/openwrt/lime- build/build/develop/staging_dir/target- mips_34kc_uClibc-0.9.33.2/pkginfo/alfred.default.install make[3]: Leaving directory '/home/gioacchino/public_html/openwrt/lime- build/build/develop/feeds/routing/alfred' make[3]: Entering directory '/home/gioacchino/public_html/openwrt/lime- build/build/develop/feeds/routing/batman-adv' make -j1 -C "/home/gioacchino/public_html/openwrt/lime- build/build/develop/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux- ar71xx_generic/linux-3.18.29" ARCH="mips" CROSS_COMPILE="mips-openwrt-linux- uclibc-" SUBDIRS="/home/gioacchino/public_html/openwrt/lime- build/build/develop/build_dir/target-mips_34kc_uClibc-0.9.33.2/batman- adv/batman-adv-2016.1/net/batman-adv" CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_BATMAN_V=n EXTRA_CFLAGS=" -DCONFIG_BATMAN_ADV=1 -DCONFIG_BATMAN_ADV_DEBUG=1 - DCONFIG_BATMAN_ADV_BLA=1 -DCONFIG_BATMAN_ADV_DAT=1 - DCONFIG_BATMAN_ADV_MCAST=1 " NOSTDINC_FLAGS="- I/home/gioacchino/public_html/openwrt/lime- build/build/develop/build_dir/target-mips_34kc_uClibc-0.9.33.2/batman- adv/batman-adv-2016.1/net/batman-adv - I/home/gioacchino/public_html/openwrt/lime- build/build/develop/staging_dir/target- mips_34kc_uClibc-0.9.33.2/usr/include/mac80211-backport/uapi - I/home/gioacchino/public_html/openwrt/lime- build/build/develop/staging_dir/target- mips_34kc_uClibc-0.9.33.2/usr/include/mac80211-backport - I/home/gioacchino/public_html/openwrt/lime- build/build/develop/staging_dir/target- mips_34kc_uClibc-0.9.33.2/usr/include/mac80211/uapi - I/home/gioacchino/public_html/openwrt/lime- build/build/develop/staging_dir/target- mips_34kc_uClibc-0.9.33.2/usr/include/mac80211 -include backport/backport.h - include /home/gioacchino/public_html/openwrt/lime- build/build/develop/build_dir/target-mips_34kc_uClibc-0.9.33.2/batman- adv/batman-adv-2016.1/compat-hacks.h" modules make[4]: Entering directory '/home/gioacchino/public_html/openwrt/lime- build/build/develop/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux- ar71xx_generic/linux-3.18.29' CC [M] /home/gioacchino/public_html/openwrt/lime- build/build/develop/build_dir/target-mips_34kc_uClibc-0.9.33.2/batman- adv/batman-adv-2016.1/net/batman-adv/bat_iv_ogm.o cc1: fatal error: backport/backport.h: No such file or directory compilation terminated. scripts/Makefile.build:257: recipe for target '/home/gioacchino/public_html/openwrt/lime- build/build/develop/build_dir/target-mips_34kc_uClibc-0.9.33.2/batman- adv/batman-adv-2016.1/net/batman-adv/bat_iv_ogm.o' failed make[5]: *** [/home/gioacchino/public_html/openwrt/lime- build/build/develop/build_dir/target-mips_34kc_uClibc-0.9.33.2/batman- adv/batman-adv-2016.1/net/batman-adv/bat_iv_ogm.o] Error 1 Makefile:1381: recipe for target '_module_/home/gioacchino/public_html/openwrt/lime- build/build/develop/build_dir/target-mips_34kc_uClibc-0.9.33.2/batman- adv/batman-adv-2016.1/net/batman-adv' failed make[4]: *** [_module_/home/gioacchino/public_html/openwrt/lime- build/build/develop/build_dir/target-mips_34kc_uClibc-0.9.33.2/batman- adv/batman-adv-2016.1/net/batman-adv] Error 2 make[4]: Leaving directory '/home/gioacchino/public_html/openwrt/lime- build/build/develop/build_dir/target-mips_34kc_uClibc-0.9.33.2/linux- ar71xx_generic/linux-3.18.29' Makefile:103: recipe for target '/home/gioacchino/public_html/openwrt/lime- build/build/develop/build_dir/target-mips_34kc_uClibc-0.9.33.2/batman- adv/batman-adv-2016.1/.built' failed make[3]: *** [/home/gioacchino/public_html/openwrt/lime- build/build/develop/build_dir/target-mips_34kc_uClibc-0.9.33.2/batman- adv/batman-adv-2016.1/.built] Error 2 make[3]: Leaving directory '/home/gioacchino/public_html/openwrt/lime- build/build/develop/feeds/routing/batman-adv' package/Makefile:191: recipe for target 'package/feeds/routing/batman- adv/compile' failed make[2]: *** [package/feeds/routing/batman-adv/compile] Error 2 make[2]: Leaving directory '/home/gioacchino/public_html/openwrt/lime- build/build/develop' package/Makefile:188: recipe for target '/home/gioacchino/public_html/openwrt/lime- build/build/develop/staging_dir/target- mips_34kc_uClibc-0.9.33.2/stamp/.package_compile' failed make[1]: *** [/home/gioacchino/public_html/openwrt/lime- build/build/develop/staging_dir/target- mips_34kc_uClibc-0.9.33.2/stamp/.package_compile] Error 2 make[1]: Leaving directory '/home/gioacchino/public_html/openwrt/lime- build/build/develop' /home/gioacchino/public_html/openwrt/lime- build/build/develop/include/toplevel.mk:181: recipe for target 'world' failed make: *** [world] Error 2 Cheers!

3 3

[B.A.T.M.A.N.] [PATCH v3] batman-adv: use static string for table headers
by Sven Eckelmann 05 May '16

05 May '16

From: Antonio Quartulli <a(a)unstable.cc> Use a static string when showing table headers rather then a nonsense parametric one with fixed arguments. It is easier to grep and it does not need to be recomputed at runtime each time. Reported-by: Joe Perches <joe(a)perches.com> Signed-off-by: Antonio Quartulli <a(a)unstable.cc> [sven(a)narfation.org: fix conflicts with current version] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v3: - workaround checkpatch error (over 80 chars) caused by __stringify v2: - rebased patch - added new static strings in bat_v.c and bat_iv_ogm.c Patch was resurrected from https://patchwork.open-mesh.org/patch/3599/ I've requested an rebased version at https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-March/014637.html but done it myself because it was rather trivial. --- net/batman-adv/bat_iv_ogm.c | 8 +++----- net/batman-adv/bat_v.c | 9 ++++----- net/batman-adv/bridge_loop_avoidance.c | 7 +++---- net/batman-adv/distributed-arp-table.c | 4 ++-- net/batman-adv/translation-table.c | 9 ++++----- 5 files changed, 16 insertions(+), 21 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 2c65668..d9a826a 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1866,9 +1866,8 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv, int batman_count = 0; u32 i; - seq_printf(seq, " %-15s %s (%s/%i) %17s [%10s]: %20s ...\n", - "Originator", "last-seen", "#", BATADV_TQ_MAX_VALUE, - "Nexthop", "outgoingIF", "Potential nexthops"); + seq_puts(seq, + " Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ...\n"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -1948,8 +1947,7 @@ static void batadv_iv_neigh_print(struct batadv_priv *bat_priv, struct batadv_hard_iface *hard_iface; int batman_count = 0; - seq_printf(seq, " %10s %-13s %s\n", - "IF", "Neighbor", "last-seen"); + seq_puts(seq, " IF Neighbor last-seen\n"); rcu_read_lock(); list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 3315b9a..246f9e9 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -151,8 +151,8 @@ static void batadv_v_neigh_print(struct batadv_priv *bat_priv, struct batadv_hard_iface *hard_iface; int batman_count = 0; - seq_printf(seq, " %-15s %s (%11s) [%10s]\n", "Neighbor", - "last-seen", "throughput", "IF"); + seq_puts(seq, + " Neighbor last-seen ( throughput) [ IF]\n"); rcu_read_lock(); list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { @@ -191,9 +191,8 @@ static void batadv_v_orig_print(struct batadv_priv *bat_priv, int batman_count = 0; u32 i; - seq_printf(seq, " %-15s %s (%11s) %17s [%10s]: %20s ...\n", - "Originator", "last-seen", "throughput", "Nexthop", - "outgoingIF", "Potential nexthops"); + seq_puts(seq, + " Originator last-seen ( throughput) Nexthop [outgoingIF]: Potential nexthops ...\n"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 642167f..0c951a7 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1816,8 +1816,8 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) "Claims announced for the mesh %s (orig %pM, group id %#.4x)\n", net_dev->name, primary_addr, ntohs(bat_priv->bla.claim_dest.group)); - seq_printf(seq, " %-17s %-5s %-17s [o] (%-6s)\n", - "Client", "VID", "Originator", "CRC"); + seq_puts(seq, + " Client VID Originator [o] (CRC )\n"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -1874,8 +1874,7 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) "Backbones announced for the mesh %s (orig %pM, group id %#.4x)\n", net_dev->name, primary_addr, ntohs(bat_priv->bla.claim_dest.group)); - seq_printf(seq, " %-17s %-5s %-9s (%-6s)\n", - "Originator", "VID", "last seen", "CRC"); + seq_puts(seq, " Originator VID last seen (CRC )\n"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 919a8d2..771708c 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -814,8 +814,8 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset) goto out; seq_printf(seq, "Distributed ARP Table (%s):\n", net_dev->name); - seq_printf(seq, " %-7s %-9s %4s %11s\n", "IPv4", - "MAC", "VID", "last-seen"); + seq_puts(seq, + " IPv4 MAC VID last-seen\n"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 2ed55f4..d7f37e5 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1008,8 +1008,8 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) seq_printf(seq, "Locally retrieved addresses (from %s) announced via TT (TTVN: %u):\n", net_dev->name, (u8)atomic_read(&bat_priv->tt.vn)); - seq_printf(seq, " %-13s %s %-8s %-9s (%-10s)\n", "Client", "VID", - "Flags", "Last seen", "CRC"); + seq_puts(seq, + " Client VID Flags Last seen (CRC )\n"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -1706,9 +1706,8 @@ int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset) seq_printf(seq, "Globally announced TT entries received via the mesh %s\n", net_dev->name); - seq_printf(seq, " %-13s %s %s %-15s %s (%-10s) %s\n", - "Client", "VID", "(TTVN)", "Originator", "(Curr TTVN)", - "CRC", "Flags"); + seq_puts(seq, + " Client VID (TTVN) Originator (Curr TTVN) (CRC ) Flags\n"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; -- 2.7.0

3 4

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N