commits April 2018

commits@lists.open-mesh.org

1 participants
27 discussions

[linux-merge]linux integration; annotated tag, v4.17-rc3, created. v4.17-rc3

by postmaster＠open-mesh.org

The annotated tag, v4.17-rc3 has been created at 51b71dd7b97fb2f1605cba6277e72322fdf35d04 (tag) tagging 6da6c0db5316275015e8cc2959f12a17584aeb64 (commit) replaces v4.17-rc2 tagged by Linus Torvalds on Sun Apr 29 14:17:50 2018 -0700 - Shortlog ------------------------------------------------------------ Linux v4.17-rc3 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlrmNn4eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGmBwH/ix8+4qmGjqK26my grkziZe7cyQJczOLH2xVJxRlQK9w/8Ld+pXuKiLX4bteds0U5BpVRdYXmVS3fzkG 34S0rOV+SbClXZzrR4UzjtkKPmVhurwE1HQ+VKaAlvfZicOgpdzamoGxhESufrhs IrSMeHLTbZhibjdWR2YKxZGUbcjnJT2YhopdDnmZ3Kngc3CosYx5RCRsOWaz9ZkU NJEuSi6+vFN9uEN6PyOm4Jnnyf3T2XLpGUWswBaZM8IdfDBm3Uxg47sY0gjaoLy1 ATA+abyv+DP/Nfp3KxZG5qp/4uj13422G3Q/y9qRFUR8zaF5kxRSvx0a33O/L8OM P/dmvTQ= =GzCV -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

5 years

[batman-adv] master: batman-adv: fix batadv_interface_tx()'s return type (615d4dd)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 615d4dd34ea5d9e4e30a9cbf8920375a067cc5c2 Author: Luc Van Oostenryck <luc.vanoostenryck(a)gmail.com> Date: Tue Apr 24 15:18:46 2018 +0200 batman-adv: fix batadv_interface_tx()'s return type The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, but the implementation in this driver returns an 'int'. Fix this by returning 'netdev_tx_t' in this driver too. Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck(a)gmail.com> [sven(a)narfation.org: fixed alignment] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 615d4dd34ea5d9e4e30a9cbf8920375a067cc5c2 net/batman-adv/soft-interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 67065e3..1485263 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -188,8 +188,8 @@ static void batadv_interface_set_rx_mode(struct net_device *dev) { } -static int batadv_interface_tx(struct sk_buff *skb, - struct net_device *soft_iface) +static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, + struct net_device *soft_iface) { struct ethhdr *ethhdr; struct batadv_priv *bat_priv = netdev_priv(soft_iface);

5 years, 1 month

[batman-adv] master: batman-adv: Remove unused dentry without DEBUGFS (566b52b)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 566b52be5f23eb5ffe94dd40f956c9a473129251 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Apr 19 21:01:08 2018 +0200 batman-adv: Remove unused dentry without DEBUGFS The debug_dir variable in the main structures is only accessed when CONFIG_BATMAN_ADV_DEBUGFS is enabled. It can be dropped to potentially save some bytes of memory. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 566b52be5f23eb5ffe94dd40f956c9a473129251 net/batman-adv/types.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 3b3fc14..360357f 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -215,10 +215,12 @@ struct batadv_hard_iface { struct batadv_hard_iface_bat_v bat_v; #endif +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * @debug_dir: dentry for nc subdir in batman-adv directory in debugfs */ struct dentry *debug_dir; +#endif /** * @neigh_list: list of unique single hop neighbors via this interface @@ -1242,10 +1244,12 @@ struct batadv_priv_nc { /** @work: work queue callback item for cleanup */ struct delayed_work work; +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * @debug_dir: dentry for nc subdir in batman-adv directory in debugfs */ struct dentry *debug_dir; +#endif /** * @min_tq: only consider neighbors for encoding if neigh_tq > min_tq @@ -1598,8 +1602,10 @@ struct batadv_priv { /** @mesh_obj: kobject for sysfs mesh subdirectory */ struct kobject *mesh_obj; +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** @debug_dir: dentry for debugfs batman-adv subdirectory */ struct dentry *debug_dir; +#endif /** @forw_bat_list: list of aggregated OGMs that will be forwarded */ struct hlist_head forw_bat_list;

5 years, 1 month

[batman-adv] master: batman-adv: Avoid bool in structures (b8f25ee)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit b8f25ee5d4263d4eab3a66cae338037f1645c427 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Apr 19 21:01:07 2018 +0200 batman-adv: Avoid bool in structures Using the bool type for structure member is considered inappropriate [1] for the kernel. Its size is not well defined (but usually 1 byte but maybe also 4 byte). [1] https://lkml.org/lkml/2017/11/21/384 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- b8f25ee5d4263d4eab3a66cae338037f1645c427 net/batman-adv/types.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 0174f79..3b3fc14 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1160,13 +1160,13 @@ struct batadv_priv_dat { */ struct batadv_mcast_querier_state { /** @exists: whether a querier exists in the mesh */ - bool exists; + unsigned char exists:1; /** * @shadowing: if a querier exists, whether it is potentially shadowing * multicast listeners (i.e. querier is behind our own bridge segment) */ - bool shadowing; + unsigned char shadowing:1; }; /** @@ -1207,10 +1207,10 @@ struct batadv_priv_mcast { u8 flags; /** @enabled: whether the multicast tvlv is currently enabled */ - bool enabled; + unsigned char enabled:1; /** @bridged: whether the soft interface has a bridge on top */ - bool bridged; + unsigned char bridged:1; /** * @num_want_all_unsnoopables: number of nodes wanting unsnoopable IP @@ -1389,7 +1389,7 @@ struct batadv_tp_vars { atomic_t dup_acks; /** @fast_recovery: true if in Fast Recovery mode */ - bool fast_recovery; + unsigned char fast_recovery:1; /** @recover: last sent seqno when entering Fast Recovery */ u32 recover; @@ -2046,10 +2046,10 @@ struct batadv_skb_cb { * @decoded: Marks a skb as decoded, which is checked when searching for * coding opportunities in network-coding.c */ - bool decoded; + unsigned char decoded:1; /** @num_bcasts: Counter for broadcast packet retransmissions */ - unsigned int num_bcasts; + unsigned char num_bcasts; }; /**

5 years, 1 month

[batman-adv] master: batman-adv: Avoid old nodes disabling multicast optimizations completely (82707ca)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 82707caa4d4300fc95db2cf37f003ca27c20600a Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sun Mar 25 00:32:04 2018 +0100 batman-adv: Avoid old nodes disabling multicast optimizations completely Instead of disabling multicast optimizations mesh-wide once a node with no multicast optimizations capabilities joins the mesh, do the following: Just insert such nodes into the WANT_ALL_IPV4/IPV6 lists. This is sufficient to avoid multicast packet loss to such unsupportive nodes. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 82707caa4d4300fc95db2cf37f003ca27c20600a net/batman-adv/multicast.c | 29 ++++++----------------------- net/batman-adv/soft-interface.c | 1 - net/batman-adv/types.h | 3 --- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index a35f597..86725d7 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -815,9 +815,6 @@ static int batadv_mcast_forw_mode_check(struct batadv_priv *bat_priv, if (!atomic_read(&bat_priv->multicast_mode)) return -EINVAL; - if (atomic_read(&bat_priv->mcast.num_disabled)) - return -EINVAL; - switch (ntohs(ethhdr->h_proto)) { case ETH_P_IP: return batadv_mcast_forw_mode_check_ipv4(bat_priv, skb, @@ -1183,33 +1180,23 @@ static void batadv_mcast_tvlv_ogm_handler(struct batadv_priv *bat_priv, { bool orig_mcast_enabled = !(flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND); u8 mcast_flags = BATADV_NO_FLAGS; - bool orig_initialized; if (orig_mcast_enabled && tvlv_value && tvlv_value_len >= sizeof(mcast_flags)) mcast_flags = *(u8 *)tvlv_value; + if (!orig_mcast_enabled) { + mcast_flags |= BATADV_MCAST_WANT_ALL_IPV4; + mcast_flags |= BATADV_MCAST_WANT_ALL_IPV6; + } + spin_lock_bh(&orig->mcast_handler_lock); - orig_initialized = test_bit(BATADV_ORIG_CAPA_HAS_MCAST, - &orig->capa_initialized); - /* If mcast support is turned on decrease the disabled mcast node - * counter only if we had increased it for this node before. If this - * is a completely new orig_node no need to decrease the counter. - */ if (orig_mcast_enabled && !test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) { - if (orig_initialized) - atomic_dec(&bat_priv->mcast.num_disabled); set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities); - /* If mcast support is being switched off or if this is an initial - * OGM without mcast support then increase the disabled mcast - * node counter. - */ } else if (!orig_mcast_enabled && - (test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities) || - !orig_initialized)) { - atomic_inc(&bat_priv->mcast.num_disabled); + test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) { clear_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities); } @@ -1595,10 +1582,6 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig) spin_lock_bh(&orig->mcast_handler_lock); - if (!test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities) && - test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized)) - atomic_dec(&bat_priv->mcast.num_disabled); - batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS); batadv_mcast_want_ipv4_update(bat_priv, orig, BATADV_NO_FLAGS); batadv_mcast_want_ipv6_update(bat_priv, orig, BATADV_NO_FLAGS); diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index edeffcb..67065e3 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -796,7 +796,6 @@ static int batadv_softif_init_late(struct net_device *dev) bat_priv->mcast.querier_ipv6.shadowing = false; bat_priv->mcast.flags = BATADV_NO_FLAGS; atomic_set(&bat_priv->multicast_mode, 1); - atomic_set(&bat_priv->mcast.num_disabled, 0); atomic_set(&bat_priv->mcast.num_want_all_unsnoopables, 0); atomic_set(&bat_priv->mcast.num_want_all_ipv4, 0); atomic_set(&bat_priv->mcast.num_want_all_ipv6, 0); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 476b052..0174f79 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1212,9 +1212,6 @@ struct batadv_priv_mcast { /** @bridged: whether the soft interface has a bridge on top */ bool bridged; - /** @num_disabled: number of nodes that have no mcast tvlv */ - atomic_t num_disabled; - /** * @num_want_all_unsnoopables: number of nodes wanting unsnoopable IP * traffic

5 years, 1 month

[batman-adv] master: batman-adv: Disable CONFIG_BATMAN_ADV_DEBUGFS by default (6f54248)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 6f542489678248cc99131f2856158bd2c3989368 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Mar 18 10:34:29 2018 +0100 batman-adv: Disable CONFIG_BATMAN_ADV_DEBUGFS by default All tools which were known to the batman-adv development team are supporting the batman-adv netlink interface since a while. Also debugfs is not supported for batman-adv interfaces in any non-default netns. Thus disabling CONFIG_BATMAN_ADV_DEBUGFS by default should not cause problems on most systems. It is still possible to enable it in case it is still required in a specific setup. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 6f542489678248cc99131f2856158bd2c3989368 Makefile | 2 +- README.external.rst | 2 +- gen-compat-autoconf.sh | 2 +- net/batman-adv/Kconfig | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index fe97d0a..de607ad 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # read README.external for more information about the configuration # batman-adv DebugFS entries: -export CONFIG_BATMAN_ADV_DEBUGFS=y +export CONFIG_BATMAN_ADV_DEBUGFS=n # B.A.T.M.A.N. debugging: export CONFIG_BATMAN_ADV_DEBUG=n # B.A.T.M.A.N. bridge loop avoidance: diff --git a/README.external.rst b/README.external.rst index 0e99bbe..a7694bb 100644 --- a/README.external.rst +++ b/README.external.rst @@ -43,7 +43,7 @@ option can be set to to y (enabled), n (disabled) or m (build as module). Available options and their possible values are (default marked with an "*") - * ``CONFIG_BATMAN_ADV_DEBUGFS=[y*|n]`` (B.A.T.M.A.N. debugfs entries) + * ``CONFIG_BATMAN_ADV_DEBUGFS=[y|n*]`` (B.A.T.M.A.N. debugfs entries) * ``CONFIG_BATMAN_ADV_DEBUG=[y|n*]`` (B.A.T.M.A.N. debugging) * ``CONFIG_BATMAN_ADV_BLA=[y*|n]`` (B.A.T.M.A.N. bridge loop avoidance) * ``CONFIG_BATMAN_ADV_DAT=[y*|n]`` (B.A.T.M.A.N. Distributed ARP Table) diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh index 5a4cdef..071b6cc 100755 --- a/gen-compat-autoconf.sh +++ b/gen-compat-autoconf.sh @@ -52,7 +52,7 @@ gen_config() { } # write config variables -gen_config 'CONFIG_BATMAN_ADV_DEBUGFS' ${CONFIG_BATMAN_ADV_DEBUGFS:="y"} >> "${TMP}" +gen_config 'CONFIG_BATMAN_ADV_DEBUGFS' ${CONFIG_BATMAN_ADV_DEBUGFS:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_DEBUG' ${CONFIG_BATMAN_ADV_DEBUG:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_BLA' ${CONFIG_BATMAN_ADV_BLA:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_DAT' ${CONFIG_BATMAN_ADV_DAT:="y"} >> "${TMP}" diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index e4e2e02..bee034a 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -94,13 +94,13 @@ config BATMAN_ADV_DEBUGFS bool "batman-adv debugfs entries" depends on BATMAN_ADV depends on DEBUG_FS - default y + default n help Enable this to export routing related debug tables via debugfs. The information for each soft-interface and used hard-interface can be found under batman_adv/ - If unsure, say Y. + If unsure, say N. config BATMAN_ADV_DEBUG bool "B.A.T.M.A.N. debugging"

5 years, 1 month

[alfred] tag 'v2018.1' created

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/alfred New tag : v2018.1 Referencing: a31da7538b9ee8d3eb7d4878458bb2dd2898251e

5 years, 1 month

[alfred] master: alfred: Update CHANGELOG for upcoming release (88231da)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 88231da3b87a81dcb50a7264dc0da39a117e390d Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Apr 25 18:44:19 2018 +0200 alfred: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 88231da3b87a81dcb50a7264dc0da39a117e390d CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9fce8c5..06a60ce 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,10 @@ .. SPDX-License-Identifier: GPL-2.0 +2018.1 (2018-04-25) +=================== + +* synchronization of batman-adv netlink header + 2018.0 (2018-02-26) ===================

5 years, 1 month

[alfred] master: alfred: Start new development cycle (f1e5969)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit f1e596908726511fba738da253af045420a42ba1 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Apr 25 18:44:23 2018 +0200 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- f1e596908726511fba738da253af045420a42ba1 alfred.h | 2 +- gpsd/alfred-gpsd.h | 2 +- vis/vis.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index d7194c6..9af4424 100644 --- a/alfred.h +++ b/alfred.h @@ -21,7 +21,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2018.1" +#define SOURCE_VERSION "2018.2" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 535d953..044f72d 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -39,7 +39,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2018.1" +#define SOURCE_VERSION "2018.2" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index b0c6521..0169688 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -28,7 +28,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2018.1" +#define SOURCE_VERSION "2018.2" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

5 years, 1 month

[alfred] tag 'v2018.1' deleted

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/alfred Deleted tag: v2018.1

5 years, 1 month

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2018