linux-merge November 2016

linux-merge@lists.open-mesh.org

3 participants
80 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20161122

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit 27915aa61060fd8954a68a86657784705955088a Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Nov 2 18:14:43 2016 +0100 batman-adv: Revert "fix splat on disabling an interface" The commit 9799c50372b2 ("batman-adv: fix splat on disabling an interface") fixed a warning but at the same time broke the rtnl function add_slave for devices which were temporarily removed. batadv_softif_slave_add requires soft_iface of and hard_iface to be NULL before it is allowed to be enslaved. But this resetting of soft_iface to NULL in batadv_hardif_disable_interface was removed with the aforementioned commit. Reported-by: Julian Labus <julian(a)freifunk-rtk.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index e034afb..08ce361 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -652,6 +652,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, batadv_softif_destroy_sysfs(hard_iface->soft_iface); } + hard_iface->soft_iface = NULL; batadv_hardif_put(hard_iface); out: -- LinuxNextTracking

6 years, 4 months

[linux-next] LinuxNextTracking branch, master, updated. next-20161122

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit e13258f38e927b61cdb5f4ad25309450d3b127d1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Oct 29 09:18:43 2016 +0200 batman-adv: Detect missing primaryif during tp_send as error The throughput meter detects different situations as problems for the current test. It stops the test after these and reports it to userspace. This also has to be done when the primary interface disappeared during the test. Fixes: 33a3bb4a3345 ("batman-adv: throughput meter implementation") Reported-by: Joe Perches <joe(a)perches.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 2333777..8af1611 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -837,6 +837,7 @@ static int batadv_tp_send(void *arg) primary_if = batadv_primary_if_get_selected(bat_priv); if (unlikely(!primary_if)) { err = BATADV_TP_REASON_DST_UNREACHABLE; + tp_vars->reason = err; goto out; } -- LinuxNextTracking

6 years, 4 months

[linux-next] LinuxNextTracking branch, master, updated. next-20161122

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit 88ffc7d0e2cdcd3d8ba603d51b81a65712899c6c Author: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Date: Fri Sep 30 15:21:00 2016 +0200 batman-adv: Return non-const ptr in batadv_getlink_net The returned net_namespace of batadv_getlink_net may be used with functions that potentially modify the struct. Thus it must return the pointer as non-const like rtnl_link_ops::get_link_net does. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index a7a462e..fdbb47e 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -92,8 +92,8 @@ out: * * Return: result of rtnl_link_ops->get_link_net or @fallback_net */ -static const struct net *batadv_getlink_net(const struct net_device *netdev, - const struct net *fallback_net) +static struct net *batadv_getlink_net(const struct net_device *netdev, + struct net *fallback_net) { if (!netdev->rtnl_link_ops) return fallback_net; @@ -116,9 +116,9 @@ static const struct net *batadv_getlink_net(const struct net_device *netdev, * Return: true if the devices are each others parent, otherwise false */ static bool batadv_mutual_parents(const struct net_device *dev1, - const struct net *net1, + struct net *net1, const struct net_device *dev2, - const struct net *net2) + struct net *net2) { int dev1_parent_iflink = dev_get_iflink(dev1); int dev2_parent_iflink = dev_get_iflink(dev2); @@ -154,7 +154,7 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev) { struct net *net = dev_net(net_dev); struct net_device *parent_dev; - const struct net *parent_net; + struct net *parent_net; bool ret; /* check if this is a batman-adv mesh interface */ -- LinuxNextTracking

6 years, 4 months

[linux-next] LinuxNextTracking branch, master, updated. next-20161122

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit f44a3ae9a2811cfd5321e0f72c02bc270410db64 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Sep 30 15:21:02 2016 +0200 batman-adv: refactor wifi interface detection The ELP protocol requires cfg80211 to auto-detect the WiFi througput to a given neighbor. Use batadv_is_cfg80211_netdev() to determine whether or not an interface is eligible. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 54bdd41..e601def 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -90,22 +90,21 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) * cfg80211 API */ if (batadv_is_wifi_netdev(hard_iface->net_dev)) { - if (hard_iface->net_dev->ieee80211_ptr) { - ret = cfg80211_get_station(hard_iface->net_dev, - neigh->addr, &sinfo); - if (ret == -ENOENT) { - /* Node is not associated anymore! It would be - * possible to delete this neighbor. For now set - * the throughput metric to 0. - */ - return 0; - } - if (!ret) - return sinfo.expected_throughput / 100; + if (!batadv_is_cfg80211_netdev(hard_iface->net_dev)) + /* unsupported WiFi driver version */ + goto default_throughput; + + ret = cfg80211_get_station(hard_iface->net_dev, + neigh->addr, &sinfo); + if (ret == -ENOENT) { + /* Node is not associated anymore! It would be + * possible to delete this neighbor. For now set + * the throughput metric to 0. + */ + return 0; } - - /* unsupported WiFi driver version */ - goto default_throughput; + if (!ret) + return sinfo.expected_throughput / 100; } /* if not a wifi interface, check if this device provides data via diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index fdbb47e..c3fbc1b 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -202,6 +202,26 @@ static bool batadv_is_valid_iface(const struct net_device *net_dev) } /** + * batadv_is_cfg80211_netdev - check if the given net_device struct is a + * cfg80211 wifi interface + * @net_device: the device to check + * + * Return: true if the net device is a cfg80211 wireless device, false + * otherwise. + */ +bool batadv_is_cfg80211_netdev(struct net_device *net_device) +{ + if (!net_device) + return false; + + /* cfg80211 drivers have to set ieee80211_ptr */ + if (net_device->ieee80211_ptr) + return true; + + return false; +} + +/** * batadv_is_wifi_netdev - check if the given net_device struct is a wifi * interface * @net_device: the device to check @@ -221,11 +241,7 @@ bool batadv_is_wifi_netdev(struct net_device *net_device) return true; #endif - /* cfg80211 drivers have to set ieee80211_ptr */ - if (net_device->ieee80211_ptr) - return true; - - return false; + return batadv_is_cfg80211_netdev(net_device); } /** diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index a043182..7f9acab 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.h @@ -65,6 +65,7 @@ enum batadv_hard_if_cleanup { extern struct notifier_block batadv_hard_if_notifier; +bool batadv_is_cfg80211_netdev(struct net_device *net_device); bool batadv_is_wifi_netdev(struct net_device *net_device); bool batadv_is_wifi_iface(int ifindex); struct batadv_hard_iface* -- LinuxNextTracking

6 years, 4 months

Build check errors found: 2016-11-22

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/hard-interface.c | 1 - netnext/net/batman-adv/tp_meter.c | 1 - 2 files changed, 2 deletions(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 109 Tested Linux versions: 27 Tested configs: 73 master ------ Failed tests: 1 Started build tests: 125 Tested Linux versions: 27 Tested configs: 84

6 years, 4 months

Build check errors found: 2016-11-21

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/hard-interface.c | 1 - netnext/net/batman-adv/tp_meter.c | 1 - 2 files changed, 2 deletions(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 115 Tested Linux versions: 27 Tested configs: 74 master ------ Failed tests: 1 Started build tests: 107 Tested Linux versions: 27 Tested configs: 77

6 years, 4 months

Build check errors found: 2016-11-20

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/hard-interface.c | 1 - netnext/net/batman-adv/tp_meter.c | 1 - 2 files changed, 2 deletions(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 119 Tested Linux versions: 27 Tested configs: 76 master ------ Failed tests: 1 Started build tests: 117 Tested Linux versions: 27 Tested configs: 83

6 years, 4 months

Build check errors found: 2016-11-19

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/hard-interface.c | 1 - net/net/batman-adv/tp_meter.c | 1 - 2 files changed, 2 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 21 - netnext/net/batman-adv/bat_v_elp.c | 41 +- netnext/net/batman-adv/hard-interface.c | 174 ------------ netnext/net/batman-adv/hard-interface.h | 5 netnext/net/batman-adv/main.c | 3 netnext/net/batman-adv/send.c | 283 ++++---------------- netnext/net/batman-adv/send.h | 5 netnext/net/batman-adv/tp_meter.c | 1 netnext/net/batman-adv/translation-table.c | 10 netnext/net/batman-adv/types.h | 19 - 10 files changed, 115 insertions(+), 447 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 101 Tested Linux versions: 26 Tested configs: 67 maint ----- Failed tests: 1 Started build tests: 115 Tested Linux versions: 27 Tested configs: 75

6 years, 4 months

Build check errors found: 2016-11-18

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/hard-interface.c | 1 - net/net/batman-adv/tp_meter.c | 1 - 2 files changed, 2 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 21 - netnext/net/batman-adv/bat_v_elp.c | 41 +- netnext/net/batman-adv/hard-interface.c | 174 ------------ netnext/net/batman-adv/hard-interface.h | 5 netnext/net/batman-adv/main.c | 3 netnext/net/batman-adv/send.c | 283 ++++---------------- netnext/net/batman-adv/send.h | 5 netnext/net/batman-adv/tp_meter.c | 1 netnext/net/batman-adv/translation-table.c | 10 netnext/net/batman-adv/types.h | 19 - 10 files changed, 115 insertions(+), 447 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 101 Tested Linux versions: 26 Tested configs: 73 maint ----- Failed tests: 1 Started build tests: 119 Tested Linux versions: 27 Tested configs: 75

6 years, 4 months

Coverity Scan: Analysis completed for alfred

by scan-admin＠coverity.com

Your request for analysis of alfred has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V0… Analysis Summary: New defects found: 0 Defects eliminated: 0

6 years, 4 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge November 2016