linux-merge

linux-merge@lists.open-mesh.org

3 participants
7479 discussions

Build check errors found: 2016-03-06
by postmaster＠open-mesh.org 06 Mar '16

06 Mar '16

Name of failed tests ==================== * difference between net-next and batadv next * headers master Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- net/batman-adv/Kconfig | 2 +- net/batman-adv/bat_iv_ogm.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) headers master -------------- diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index f93cbc7..9b191bd 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -21,6 +21,7 @@ #include "main.h" #include <linux/bitops.h> +#include <linux/stddef.h> #include <linux/compiler.h> #include <linux/types.h> diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 417d30a..adc1c65 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -18,9 +18,9 @@ #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ -#include "main.h" - +#include <linux/types.h> #include <net/rtnetlink.h> +#include "main.h" struct net_device; struct sk_buff;

1 0

Noticed difference in packet.h in maint.diff
by postmaster＠open-mesh.org 05 Mar '16

05 Mar '16

--- batman-adv_maint.packet.h 2016-03-06 00:05:01.584104209 +0100 +++ batctl_maint.packet.h 2016-03-06 00:05:01.592104646 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-03-05
by postmaster＠open-mesh.org 05 Mar '16

05 Mar '16

1 0

Noticed difference in packet.h in maint.diff
by postmaster＠open-mesh.org 04 Mar '16

04 Mar '16

--- batman-adv_maint.packet.h 2016-03-05 00:05:01.775984602 +0100 +++ batctl_maint.packet.h 2016-03-05 00:05:01.819987540 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-03-04
by postmaster＠open-mesh.org 04 Mar '16

04 Mar '16

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160303
by batman＠open-mesh.org 03 Mar '16

03 Mar '16

The following commit has been merged in the master branch: commit fb653ebddcf871e8a83a63c1e4e73d41bc3cf599 Author: Arnd Bergmann <arnd(a)arndb.de> Date: Wed Mar 2 14:54:35 2016 +0100 batman-adv: clarify CFG80211 dependency The driver calls cfg80211_get_station, which may be part of a module, so we must not enable BATMAN_ADV_BATMAN_V if BATMAN_ADV=y and CFG80211=m: net/built-in.o: In function `batadv_v_elp_get_throughput': (text+0x5c62c): undefined reference to `cfg80211_get_station' This clarifies the dependency to cover all combinations. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: c833484e5f38 ("batman-adv: ELP - compute the metric based on the estimated throughput") Acked-by: Antonio Quartulli <a(a)unstable.cc> Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index e651dc9..f66930e 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -17,7 +17,7 @@ config BATMAN_ADV config BATMAN_ADV_BATMAN_V bool "B.A.T.M.A.N. V protocol (experimental)" - depends on BATMAN_ADV && CFG80211 + depends on BATMAN_ADV && CFG80211=y || (CFG80211=m && BATMAN_ADV=m) default n help This option enables the B.A.T.M.A.N. V protocol, the successor -- LinuxNextTracking

1 0

Noticed difference in packet.h in maint.diff
by postmaster＠open-mesh.org 03 Mar '16

03 Mar '16

--- batman-adv_maint.packet.h 2016-03-04 00:05:01.755693038 +0100 +++ batctl_maint.packet.h 2016-03-04 00:05:01.819697299 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-03-03
by postmaster＠open-mesh.org 03 Mar '16

03 Mar '16

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160302
by batman＠open-mesh.org 02 Mar '16

02 Mar '16

The following commit has been merged in the master branch: commit 97575407e9547416a23de03d141072e639f04623 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Jan 19 17:08:29 2016 +0100 batman-adv: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Antonio Quartulli <a(a)unstable.cc> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 878c359..db45336 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -24,7 +24,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2016.0" +#define BATADV_SOURCE_VERSION "2016.1" #endif /* B.A.T.M.A.N. parameters */ -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160302
by batman＠open-mesh.org 02 Mar '16

02 Mar '16

The following commit has been merged in the master branch: commit 626d23e83c88df5ff535414c2fe29e16b95d6b7a Author: Linus Luessing <linus.luessing(a)web.de> Date: Sat Jan 16 16:40:19 2016 +0800 batman-adv: B.A.T.M.A.N. V - implement bat_neigh_print API Lists all neighbours detected by the Echo Locating Protocol (ELP) and their throughput metric. Initially Developed by Linus during a 6 months trainee study period in Ascom (Switzerland) AG. Signed-off-by: Linus Luessing <linus.luessing(a)web.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index a90117c..3315b9a 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -118,6 +118,60 @@ batadv_v_orig_print_neigh(struct batadv_orig_node *orig_node, } /** + * batadv_v_hardif_neigh_print - print a single ELP neighbour node + * @seq: neighbour table seq_file struct + * @hardif_neigh: hardif neighbour information + */ +static void +batadv_v_hardif_neigh_print(struct seq_file *seq, + struct batadv_hardif_neigh_node *hardif_neigh) +{ + int last_secs, last_msecs; + u32 throughput; + + last_secs = jiffies_to_msecs(jiffies - hardif_neigh->last_seen) / 1000; + last_msecs = jiffies_to_msecs(jiffies - hardif_neigh->last_seen) % 1000; + throughput = ewma_throughput_read(&hardif_neigh->bat_v.throughput); + + seq_printf(seq, "%pM %4i.%03is (%9u.%1u) [%10s]\n", + hardif_neigh->addr, last_secs, last_msecs, throughput / 10, + throughput % 10, hardif_neigh->if_incoming->net_dev->name); +} + +/** + * batadv_v_neigh_print - print the single hop neighbour list + * @bat_priv: the bat priv with all the soft interface information + * @seq: neighbour table seq_file struct + */ +static void batadv_v_neigh_print(struct batadv_priv *bat_priv, + struct seq_file *seq) +{ + struct net_device *net_dev = (struct net_device *)seq->private; + struct batadv_hardif_neigh_node *hardif_neigh; + struct batadv_hard_iface *hard_iface; + int batman_count = 0; + + seq_printf(seq, " %-15s %s (%11s) [%10s]\n", "Neighbor", + "last-seen", "throughput", "IF"); + + rcu_read_lock(); + list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { + if (hard_iface->soft_iface != net_dev) + continue; + + hlist_for_each_entry_rcu(hardif_neigh, + &hard_iface->neigh_list, list) { + batadv_v_hardif_neigh_print(seq, hardif_neigh); + batman_count++; + } + } + rcu_read_unlock(); + + if (batman_count == 0) + seq_puts(seq, "No batman nodes in range ...\n"); +} + +/** * batadv_v_orig_print - print the originator table * @bat_priv: the bat priv with all the soft interface information * @seq: debugfs table seq_file struct @@ -230,6 +284,7 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = { .bat_orig_print = batadv_v_orig_print, .bat_neigh_cmp = batadv_v_neigh_cmp, .bat_neigh_is_similar_or_better = batadv_v_neigh_is_sob, + .bat_neigh_print = batadv_v_neigh_print, }; /** -- LinuxNextTracking

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge