commits

commits@lists.open-mesh.org

1 participants
12404 discussions

[batman-adv] master: batman-adv: Fix typo metAdata (1dc4d5fb)
by postmaster＠open-mesh.org 12 Dec '19

12 Dec '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 1dc4d5fbf9626d65d99ec9a61db219883322631c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Nov 16 08:28:58 2019 +0100 batman-adv: Fix typo metAdata Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 1dc4d5fbf9626d65d99ec9a61db219883322631c net/batman-adv/types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 47718a82..bdf9827b 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -457,7 +457,7 @@ struct batadv_orig_node { /** * @tt_lock: prevents from updating the table while reading it. Table * update is made up by two operations (data structure update and - * metdata -CRC/TTVN-recalculation) and they have to be executed + * metadata -CRC/TTVN-recalculation) and they have to be executed * atomically in order to avoid another thread to read the * table/metadata between those. */ @@ -1011,7 +1011,7 @@ struct batadv_priv_tt { /** * @commit_lock: prevents from executing a local TT commit while reading * the local table. The local TT commit is made up by two operations - * (data structure update and metdata -CRC/TTVN- recalculation) and + * (data structure update and metadata -CRC/TTVN- recalculation) and * they have to be executed atomically in order to avoid another thread * to read the table/metadata between those. */

1 0

[batman-adv] master: batman-adv: Start new development cycle (63cd41f1)
by postmaster＠open-mesh.org 12 Dec '19

12 Dec '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 63cd41f15015b2336e23b16025483abc440faf76 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 12 14:24:53 2019 +0100 batman-adv: Start new development cycle Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 63cd41f15015b2336e23b16025483abc440faf76 net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index c7b340dd..fd8c0728 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2019.5" +#define BATADV_SOURCE_VERSION "2020.0" #endif /* B.A.T.M.A.N. parameters */

1 0

[batman-adv] master: batman-adv: Annotate bitwise integer pointer casts (3eddef2c)
by postmaster＠open-mesh.org 12 Dec '19

12 Dec '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 3eddef2cdc3c30b0867e791455bf5be84a28a68d Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Nov 28 12:55:58 2019 +0100 batman-adv: Annotate bitwise integer pointer casts The sparse commit 6002ded74587 ("add a flag to warn on casts to/from bitwise pointers") introduced a check for non-direct casts from/to restricted datatypes (when -Wbitwise-pointer is enabled). This triggered various warnings in batman-adv when some (already big endian) buffer content was casted to/from the corresponding big endian integer data types. But these were correct and can therefore be marked with __force to signalize sparse an intended cast from/to a bitwise type. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 3eddef2cdc3c30b0867e791455bf5be84a28a68d net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/distributed-arp-table.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 663a53b6..0eff3358 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -844,7 +844,7 @@ static bool batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr, /* handle as ANNOUNCE frame */ backbone_gw->lasttime = jiffies; - crc = ntohs(*((__be16 *)(&an_addr[4]))); + crc = ntohs(*((__force __be16 *)(&an_addr[4]))); batadv_dbg(BATADV_DBG_BLA, bat_priv, "%s(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n", diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index ec7bf5a4..581b3181 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -246,7 +246,7 @@ static u8 *batadv_arp_hw_src(struct sk_buff *skb, int hdr_size) */ static __be32 batadv_arp_ip_src(struct sk_buff *skb, int hdr_size) { - return *(__be32 *)(batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN); + return *(__force __be32 *)(batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN); } /** @@ -270,7 +270,9 @@ static u8 *batadv_arp_hw_dst(struct sk_buff *skb, int hdr_size) */ static __be32 batadv_arp_ip_dst(struct sk_buff *skb, int hdr_size) { - return *(__be32 *)(batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN * 2 + 4); + u8 *dst = batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN * 2 + 4; + + return *(__force __be32 *)dst; } /** @@ -288,7 +290,7 @@ static u32 batadv_hash_dat(const void *data, u32 size) __be16 vid; u32 i; - key = (const unsigned char *)&dat->ip; + key = (__force const unsigned char *)&dat->ip; for (i = 0; i < sizeof(dat->ip); i++) { hash += key[i]; hash += (hash << 10);

1 0

[batman-adv] master: batman-adv: ELP - use wifi tx bitrate as fallback throughput (dcb63377)
by postmaster＠open-mesh.org 12 Dec '19

12 Dec '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit dcb63377d9de914e15c500aead14f28c4eda8d23 Author: René Treffer <treffer(a)measite.de> Date: Tue Nov 26 10:27:38 2019 +0800 batman-adv: ELP - use wifi tx bitrate as fallback throughput Some wifi drivers (e.g. ath10k) provide per-station rx/tx values but no estimated throughput. Setting a better estimate than the default 1 MBit makes these devices work well with B.A.T.M.A.N. V. Signed-off-by: René Treffer <treffer(a)measite.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- dcb63377d9de914e15c500aead14f28c4eda8d23 net/batman-adv/bat_v_elp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 2614a9ca..1e852d4b 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -107,10 +107,15 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) } if (ret) goto default_throughput; - if (!(sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT))) - goto default_throughput; - return sinfo.expected_throughput / 100; + if (sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT)) + return sinfo.expected_throughput / 100; + + /* try to estimate en expected throughput based on reported tx rates */ + if (sinfo.filled & BIT(NL80211_STA_INFO_TX_BITRATE)) + return cfg80211_calculate_bitrate(&sinfo.txrate) / 3; + + goto default_throughput; } /* if not a wifi interface, check if this device provides data via

1 0

[batman-adv] master: batman-adv: Replace FIELD_SIZEOF with sizeof_field (1aab3d25)
by postmaster＠open-mesh.org 12 Dec '19

12 Dec '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 1aab3d25814a3b0b434e17c25aa617d34d2c3f74 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Dec 11 09:52:17 2019 +0100 batman-adv: Replace FIELD_SIZEOF with sizeof_field The prefered way of getting the size of a member of a struct is the common macro sizeof_field from stddef.h and not the FIELD_SIZEOF (with multiple definitions). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 1aab3d25814a3b0b434e17c25aa617d34d2c3f74 compat-include/linux/{types.h => stddef.h} | 14 ++++++-------- net/batman-adv/main.c | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/compat-include/linux/types.h b/compat-include/linux/stddef.h similarity index 58% copy from compat-include/linux/types.h copy to compat-include/linux/stddef.h index 22ba449e..dd18840e 100644 --- a/compat-include/linux/types.h +++ b/compat-include/linux/stddef.h @@ -7,20 +7,18 @@ * of the Linux kernel. */ -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_TYPES_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_TYPES_H_ +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ #include <linux/version.h> -#include_next <linux/types.h> +#include_next <linux/stddef.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) -#ifdef __CHECK_POLL -typedef unsigned __bitwise __poll_t; -#else -typedef unsigned __poll_t; +#ifndef sizeof_field +#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) #endif #endif /* < KERNEL_VERSION(4, 16, 0) */ -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_TYPES_H_ */ +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ */ diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 4a89177d..4811ec65 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -548,7 +548,7 @@ static void batadv_recv_handler_init(void) BUILD_BUG_ON(sizeof(struct batadv_tvlv_tt_change) != 12); BUILD_BUG_ON(sizeof(struct batadv_tvlv_roam_adv) != 8); - i = FIELD_SIZEOF(struct sk_buff, cb); + i = sizeof_field(struct sk_buff, cb); BUILD_BUG_ON(sizeof(struct batadv_skb_cb) > i); /* broadcast packet */

1 0

[batman-adv] master: batman-adv: Strip dots from variable macro kerneldoc (bc3be2f0)
by postmaster＠open-mesh.org 12 Dec '19

12 Dec '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit bc3be2f0361839eaefb9045eda99eff0e842ebcc Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Nov 14 22:12:37 2019 +0100 batman-adv: Strip dots from variable macro kerneldoc The commit 43756e347f21 ("scripts/kernel-doc: Add support for named variable macro arguments") changed the handling of variable macro parameters. The three dots of the argument must no longer be added to the kernel doc. The support for the old format is scheduled to be removed in the future. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- bc3be2f0361839eaefb9045eda99eff0e842ebcc net/batman-adv/log.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h index 741cfa37..41fd9001 100644 --- a/net/batman-adv/log.h +++ b/net/batman-adv/log.h @@ -74,7 +74,7 @@ __printf(2, 3); * @bat_priv: the bat priv with all the soft interface information * @ratelimited: whether output should be rate limited * @fmt: format string - * @arg...: variable arguments + * @arg: variable arguments */ #define _batadv_dbg(type, bat_priv, ratelimited, fmt, arg...) \ do { \ @@ -98,7 +98,7 @@ static inline void _batadv_dbg(int type __always_unused, * batadv_dbg() - Store debug output without ratelimiting * @type: type of debug message * @bat_priv: the bat priv with all the soft interface information - * @arg...: format string and variable arguments + * @arg: format string and variable arguments */ #define batadv_dbg(type, bat_priv, arg...) \ _batadv_dbg(type, bat_priv, 0, ## arg) @@ -107,7 +107,7 @@ static inline void _batadv_dbg(int type __always_unused, * batadv_dbg_ratelimited() - Store debug output with ratelimiting * @type: type of debug message * @bat_priv: the bat priv with all the soft interface information - * @arg...: format string and variable arguments + * @arg: format string and variable arguments */ #define batadv_dbg_ratelimited(type, bat_priv, arg...) \ _batadv_dbg(type, bat_priv, 1, ## arg) @@ -116,7 +116,7 @@ static inline void _batadv_dbg(int type __always_unused, * batadv_info() - Store message in debug buffer and print it to kmsg buffer * @net_dev: the soft interface net device * @fmt: format string - * @arg...: variable arguments + * @arg: variable arguments */ #define batadv_info(net_dev, fmt, arg...) \ do { \ @@ -130,7 +130,7 @@ static inline void _batadv_dbg(int type __always_unused, * batadv_err() - Store error in debug buffer and print it to kmsg buffer * @net_dev: the soft interface net device * @fmt: format string - * @arg...: variable arguments + * @arg: variable arguments */ #define batadv_err(net_dev, fmt, arg...) \ do { \

1 0

[batman-adv] tag 'v2019.5' created
by postmaster＠open-mesh.org 12 Dec '19

12 Dec '19

Repository : ssh://git@open-mesh.org/batman-adv New tag : v2019.5 Referencing: 5256e60e649fb9042f231a329039af8b76d6c510

1 0

[batman-adv] maint's head updated: batman-adv: Update CHANGELOG for upcoming release (be3500ea)
by postmaster＠open-mesh.org 12 Dec '19

12 Dec '19

Repository : ssh://git@open-mesh.org/batman-adv Branch 'maint' now includes: a2f28f47 batman-adv: Start new development cycle 80870646 Merge branch 'maint' 25703aaf batman-adv: Drop lockdep.h include for soft-interface.c 8a54d0aa batman-adv: Use sizeof_member() macro af0f7040 batman-adv: Simplify 'batadv_v_ogm_aggr_list_free()' ecebfa46 batman-adv: Axe 'aggr_list_lock' 7bb9b06a batman-adv: Use 'fallthrough' pseudo keyword 890c6748 batman-adv: Use GCC attribute for fallthrough compat ade59690 Merge branch 'maint' 4c7c9b34 batman-adv: Revert "Use sizeof_member() macro" be3500ea batman-adv: Update CHANGELOG for upcoming release

1 0

[batman-adv] master: batman-adv: Update compatible kernel version number (6fe01862)
by postmaster＠open-mesh.org 12 Dec '19

12 Dec '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 6fe0186294422afcf071f0f558af794a25c17976 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Dec 12 13:44:30 2019 +0100 batman-adv: Update compatible kernel version number Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 6fe0186294422afcf071f0f558af794a25c17976 README.external.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.external.rst b/README.external.rst index 5d927853..6db0117d 100644 --- a/README.external.rst +++ b/README.external.rst @@ -12,7 +12,7 @@ and as external module. The external module allows to get new features without upgrading to a newer kernel version and to get batman-adv specific bugfixes for kernels that are not supported anymore. It compiles against and should work -with Linux 3.16 - 5.4. Supporting older versions is not +with Linux 3.16 - 5.5. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-)

1 0

[batman-adv] master: batman-adv: Update CHANGELOG for upcoming release (be3500ea)
by postmaster＠open-mesh.org 12 Dec '19

12 Dec '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit be3500eaa01b682155ae65722e536801847e836f Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Dec 12 13:43:25 2019 +0100 batman-adv: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- be3500eaa01b682155ae65722e536801847e836f CHANGELOG.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 69a7c67c..6f87eab0 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,14 @@ .. SPDX-License-Identifier: GPL-2.0 +2019.5 (2019-12-12) +=================== + +* support latest kernels (3.16 - 5.5) +* coding style cleanups and refactoring +* bugs squashed: + + - fix DAT candidate selection on little endian systems + 2019.4 (2019-10-25) ===================

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits