commits October 2018

commits@lists.open-mesh.org

1 participants
63 discussions

[openwrt-feed-devel] master: batman-adv-devel: Add compat for link_ksettings->base.autoneg (521eccf)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 521eccf10b3ea90383f8f9e47c546edfb28b01b0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 19 00:30:28 2018 +0200 batman-adv-devel: Add compat for link_ksettings->base.autoneg Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 521eccf10b3ea90383f8f9e47c546edfb28b01b0 batman-adv-devel/files/compat-hacks.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/files/compat-hacks.h index d35cece..0cf8e31 100644 --- a/batman-adv-devel/files/compat-hacks.h +++ b/batman-adv-devel/files/compat-hacks.h @@ -98,6 +98,7 @@ struct batadv_ethtool_link_ksettings { struct { __u32 speed; __u8 duplex; + __u8 autoneg; } base; }; @@ -119,6 +120,7 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev, link_ksettings->base.duplex = cmd.duplex; link_ksettings->base.speed = ethtool_cmd_speed(&cmd); + link_ksettings->base.autoneg = cmd.autoneg; return 0; }

1 0

[openwrt-feed-devel] master: batman-adv-devel: Remove outdated SVN $Id$ placeholder (b5dbb36)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit b5dbb368caa71c7d37636ed9d97135fb4f8c5085 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jul 29 09:28:47 2017 +0200 batman-adv-devel: Remove outdated SVN $Id$ placeholder Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- b5dbb368caa71c7d37636ed9d97135fb4f8c5085 batman-adv-devel/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index d7ae6a1..c7959fd 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -4,7 +4,6 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $ include $(TOPDIR)/rules.mk

1 0

[openwrt-feed-devel] master: batman-adv-devel: Fix conflicts with compat-wireless backports-4.14-rc1 (74480d1)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 74480d13efdee3f5e09fe555457644ccaa13094a Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Sep 18 14:21:49 2017 +0200 batman-adv-devel: Fix conflicts with compat-wireless backports-4.14-rc1 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 74480d13efdee3f5e09fe555457644ccaa13094a batman-adv-devel/files/compat-hacks.h | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/files/compat-hacks.h index 4ae2bcc..9675ad8 100644 --- a/batman-adv-devel/files/compat-hacks.h +++ b/batman-adv-devel/files/compat-hacks.h @@ -116,6 +116,10 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev, #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) +#ifdef netif_trans_update +#undef netif_trans_update +#endif + #define netif_trans_update batadv_netif_trans_update static inline void batadv_netif_trans_update(struct net_device *dev) { @@ -202,6 +206,10 @@ static inline int batadv_nla_put_64bit(struct sk_buff *skb, int attrtype, return 0; } +#ifdef nla_put_u64_64bit +#undef nla_put_u64_64bit +#endif + #define nla_put_u64_64bit(_skb, _attrtype, _value, _padattr) \ batadv_nla_put_u64_64bit(_skb, _attrtype, _value, _padattr) static inline int batadv_nla_put_u64_64bit(struct sk_buff *skb, int attrtype, @@ -253,9 +261,13 @@ static inline void *batadv_skb_put(struct sk_buff *skb, unsigned int len) { return (void *)skb_put(skb, len); } +#ifdef skb_put +#undef skb_put +#endif + #define skb_put batadv_skb_put -static inline void *skb_put_zero(struct sk_buff *skb, unsigned int len) +static inline void *batadv_skb_put_zero(struct sk_buff *skb, unsigned int len) { void *tmp = skb_put(skb, len); @@ -263,8 +275,13 @@ static inline void *skb_put_zero(struct sk_buff *skb, unsigned int len) return tmp; } +#ifdef skb_put_zero +#undef skb_put_zero +#endif + +#define skb_put_zero batadv_skb_put_zero -static inline void *skb_put_data(struct sk_buff *skb, const void *data, +static inline void *batadv_skb_put_data(struct sk_buff *skb, const void *data, unsigned int len) { void *tmp = skb_put(skb, len); @@ -273,6 +290,11 @@ static inline void *skb_put_data(struct sk_buff *skb, const void *data, return tmp; } +#ifdef skb_put_data +#undef skb_put_data +#endif + +#define skb_put_data batadv_skb_put_data #endif /* < KERNEL_VERSION(4, 13, 0) */

1 0

[openwrt-feed-devel] master: batman-adv-devel: Provide default settings examples for bat0 (40f0156)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 40f01563def8093e8262addd93477b04ce2e7629 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 13 13:45:22 2018 +0200 batman-adv-devel: Provide default settings examples for bat0 Users may want to know what options can be specified and in which form they have to specified. A commented out list of settings is helpful here while making it not necessary to copy the default settings from batman-adv to this config all the time. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 40f01563def8093e8262addd93477b04ce2e7629 batman-adv-devel/files/etc/config/batman-adv | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index 6e6017a..21138cb 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -1,20 +1,20 @@ config 'mesh' 'bat0' - option 'aggregated_ogms' - option 'ap_isolation' - option 'bonding' - option 'fragmentation' - option 'gw_bandwidth' - option 'gw_mode' - option 'gw_sel_class' - option 'log_level' - option 'orig_interval' - option 'bridge_loop_avoidance' - option 'distributed_arp_table' - option 'multicast_mode' - option 'network_coding' - option 'hop_penalty' - option 'isolation_mark' + #option 'aggregated_ogms' 1 + #option 'ap_isolation' 0 + #option 'bonding' 0 + #option 'fragmentation' 1 + #option 'gw_bandwidth' '10000/2000' + #option 'gw_mode' 'off' + #option 'gw_sel_class' 20 + #option 'log_level' 0 + #option 'orig_interval' 1000 + #option 'bridge_loop_avoidance' 1 + #option 'distributed_arp_table' 1 + #option 'multicast_mode' 1 + #option 'network_coding' 0 + #option 'hop_penalty' 30 + #option 'isolation_mark' '0x00000000/0x00000000' # yet another batX instance # config 'mesh' 'bat5'

1 0

[openwrt-feed-devel] master: alfred-devel: bat-hosts.lua: 'alfred -r' can fail with no output, so retry 3 times (7628174)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 7628174bd470b2f5bd80f6d3d4360f3a365e98ed Author: Gui Iribarren <gui(a)altermundi.net> Date: Mon Aug 8 00:35:35 2016 +0200 alfred-devel: bat-hosts.lua: 'alfred -r' can fail with no output, so retry 3 times Signed-off-by: Gui Iribarren <gui(a)altermundi.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 7628174bd470b2f5bd80f6d3d4360f3a365e98ed alfred-devel/files/bat-hosts.lua | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/alfred-devel/files/bat-hosts.lua b/alfred-devel/files/bat-hosts.lua index 8648caf..f9fe586 100644 --- a/alfred-devel/files/bat-hosts.lua +++ b/alfred-devel/files/bat-hosts.lua @@ -87,19 +87,24 @@ end local function receive_bat_hosts() -- read raw chunks from alfred, convert them to a nested table and call write_bat_hosts - local fd = io.popen("alfred -r " .. type_id) - --[[ this command returns something like - { "54:e6:fc:b9:cb:37", "00:11:22:33:44:55 ham_wlan0\x0a00:22:33:22:33:22 ham_eth0\x0a" }, - { "90:f6:52:bb:ec:57", "00:22:33:22:33:23 spam\x0a" }, - ]]-- - - if fd then - local output = fd:read("*a") - if output then - assert(loadstring("rows = {" .. output .. "}"))() - write_bat_hosts(rows) +-- "alfred -r" can fail in slave nodes (returns empty stdout), so: +-- check output is not null before writing /tmp/bat-hosts, and retry 3 times before giving up. + for n = 1, 3 do + local fd = io.popen("alfred -r " .. type_id) + --[[ this command returns something like + { "54:e6:fc:b9:cb:37", "00:11:22:33:44:55 ham_wlan0\x0a00:22:33:22:33:22 ham_eth0\x0a" }, + { "90:f6:52:bb:ec:57", "00:22:33:22:33:23 spam\x0a" }, + ]]-- + + if fd then + local output = fd:read("*a") + fd:close() + if output and output ~= "" then + assert(loadstring("rows = {" .. output .. "}"))() + write_bat_hosts(rows) + break + end end - fd:close() end end

1 0

[openwrt-feed-devel] master: batman-adv-devel: initialize sinfo in cfg80211_get_station (8027297)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 802729745a534b00a513efdddd7c480f693d78d7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jun 12 22:10:57 2018 +0200 batman-adv-devel: initialize sinfo in cfg80211_get_station Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 802729745a534b00a513efdddd7c480f693d78d7 batman-adv-devel/files/compat-hacks.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/files/compat-hacks.h index d7f30ad..d35cece 100644 --- a/batman-adv-devel/files/compat-hacks.h +++ b/batman-adv-devel/files/compat-hacks.h @@ -336,6 +336,26 @@ static inline void timer_setup(struct timer_list *timer, #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) + +#include <net/cfg80211.h> + +/* cfg80211 fix: https://patchwork.kernel.org/patch/10449857/ */ +static inline int batadv_cfg80211_get_station(struct net_device *dev, + const u8 *mac_addr, + struct station_info *sinfo) +{ + memset(sinfo, 0, sizeof(*sinfo)); + return cfg80211_get_station(dev, mac_addr, sinfo); +} + +#define cfg80211_get_station(dev, mac_addr, sinfo) \ + batadv_cfg80211_get_station(dev, mac_addr, sinfo) + +#endif /* < KERNEL_VERSION(4, 18, 0) */ + + #ifdef __CHECK_POLL typedef unsigned __bitwise __poll_t; #else

1 0

[openwrt-feed-devel] master: batman-adv-devel: Fix missing function name for timer_setup (315fe57)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 315fe57e23f3b47083292e885ec0621a0e4c7ce0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Dec 26 11:52:22 2017 +0100 batman-adv-devel: Fix missing function name for timer_setup Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 315fe57e23f3b47083292e885ec0621a0e4c7ce0 batman-adv-devel/files/compat-hacks.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/files/compat-hacks.h index a5277c8..a27408d 100644 --- a/batman-adv-devel/files/compat-hacks.h +++ b/batman-adv-devel/files/compat-hacks.h @@ -321,7 +321,7 @@ static inline void *batadv_skb_put_data(struct sk_buff *skb, const void *data, #define TIMER_DATA_TYPE unsigned long #define TIMER_FUNC_TYPE void (*)(TIMER_DATA_TYPE) -static inline void (struct timer_list *timer, +static inline void timer_setup(struct timer_list *timer, void (*callback)(struct timer_list *), unsigned int flags) {

1 0

[openwrt-feed-devel] master: batman-adv-devel: Drop unused clean rule (3e7a7ba)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 3e7a7ba88e4280bd8c2d46f7d9a24ef4556c2187 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jul 17 21:10:47 2018 +0200 batman-adv-devel: Drop unused clean rule The path $(BUILD_DIR)/$(PKG_NAME) is not used anymore. The rule can be removed and the OpenWrt build system takes care of the removal of the build directory. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 3e7a7ba88e4280bd8c2d46f7d9a24ef4556c2187 batman-adv-devel/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index a7736ef..4da264f 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -89,10 +89,6 @@ define Build/Compile modules endef -define Build/Clean - rm -rf $(BUILD_DIR)/$(PKG_NAME)/ -endef - define KernelPackage/batman-adv-devel/install $(INSTALL_DIR) $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/etc/hotplug.d/iface $(1)/lib/batman-adv $(1)/usr/sbin $(1)/lib/netifd/proto $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config

1 0

[openwrt-feed-devel] master: alfred-devel: Support interface IDs with more than two digits (3317b1e)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 3317b1e28607a4e2ca80d9ef340e1461567e1072 Author: Adrian Schmutzler <freifunk(a)adrianschmutzler.de> Date: Mon Mar 19 14:16:54 2018 +0100 alfred-devel: Support interface IDs with more than two digits Occationally /proc/net/if_inet6 contains interface IDs with three digits. In this case, the regex in wait_for_ll_address() does not work anymore and alfred is not starting. This patch changes the evaluation so that fields are used instead of the mere position by counting characters. Signed-off-by: Adrian Schmutzler <freifunk(a)adrianschmutzler.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 3317b1e28607a4e2ca80d9ef340e1461567e1072 alfred-devel/files/alfred.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alfred-devel/files/alfred.init b/alfred-devel/files/alfred.init index 4c9a9e1..8293436 100755 --- a/alfred-devel/files/alfred.init +++ b/alfred-devel/files/alfred.init @@ -46,11 +46,11 @@ wait_for_ll_address() for i in $(seq $timeout); do # We look for # - the link-local address (starts with fe80) - # - without tentative flag (bit 0x40 in the flags field; the first char of the flags field begins 38 columns after the fe80 prefix + # - without tentative flag (bit 0x40 in the flags field; the first char of the fifth field is evaluated) # - on interface $iface if awk ' BEGIN { RET=1 } - /^fe80.{37} [012389ab]/ { if ($6 == "'"$iface"'") RET=0 } + $1 ~ /^fe80/ && $5 ~ /^[012389ab]/ && $6 == "'"$iface"'" { RET=0 } END { exit RET } ' /proc/net/if_inet6; then return

1 0

[openwrt-feed-devel] master: batman-adv-devel: upgrade compat-hacks for release 2017.0.1 (2e168e4)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 2e168e4fba7c1d9d0b7163e5b0a2e9e3283108ae Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 4 17:08:47 2017 +0100 batman-adv-devel: upgrade compat-hacks for release 2017.0.1 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 2e168e4fba7c1d9d0b7163e5b0a2e9e3283108ae batman-adv-devel/files/compat-hacks.h | 75 +++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/files/compat-hacks.h index 6c98a98..8c8a889 100644 --- a/batman-adv-devel/files/compat-hacks.h +++ b/batman-adv-devel/files/compat-hacks.h @@ -213,3 +213,78 @@ static inline int batadv_nla_put_u64_64bit(struct sk_buff *skb, int attrtype, #define __ro_after_init #endif /* < KERNEL_VERSION(4, 10, 0) */ + +/* <DECLARE_EWMA> */ + +#include <linux/version.h> +#include_next <linux/average.h> + +#include <linux/bug.h> + +#ifdef DECLARE_EWMA +#undef DECLARE_EWMA +#endif /* DECLARE_EWMA */ + +/* + * Exponentially weighted moving average (EWMA) + * + * This implements a fixed-precision EWMA algorithm, with both the + * precision and fall-off coefficient determined at compile-time + * and built into the generated helper funtions. + * + * The first argument to the macro is the name that will be used + * for the struct and helper functions. + * + * The second argument, the precision, expresses how many bits are + * used for the fractional part of the fixed-precision values. + * + * The third argument, the weight reciprocal, determines how the + * new values will be weighed vs. the old state, new values will + * get weight 1/weight_rcp and old values 1-1/weight_rcp. Note + * that this parameter must be a power of two for efficiency. + */ + +#define DECLARE_EWMA(name, _precision, _weight_rcp) \ + struct ewma_##name { \ + unsigned long internal; \ + }; \ + static inline void ewma_##name##_init(struct ewma_##name *e) \ + { \ + BUILD_BUG_ON(!__builtin_constant_p(_precision)); \ + BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp)); \ + /* \ + * Even if you want to feed it just 0/1 you should have \ + * some bits for the non-fractional part... \ + */ \ + BUILD_BUG_ON((_precision) > 30); \ + BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp); \ + e->internal = 0; \ + } \ + static inline unsigned long \ + ewma_##name##_read(struct ewma_##name *e) \ + { \ + BUILD_BUG_ON(!__builtin_constant_p(_precision)); \ + BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp)); \ + BUILD_BUG_ON((_precision) > 30); \ + BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp); \ + return e->internal >> (_precision); \ + } \ + static inline void ewma_##name##_add(struct ewma_##name *e, \ + unsigned long val) \ + { \ + unsigned long internal = ACCESS_ONCE(e->internal); \ + unsigned long weight_rcp = ilog2(_weight_rcp); \ + unsigned long precision = _precision; \ + \ + BUILD_BUG_ON(!__builtin_constant_p(_precision)); \ + BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp)); \ + BUILD_BUG_ON((_precision) > 30); \ + BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp); \ + \ + ACCESS_ONCE(e->internal) = internal ? \ + (((internal << weight_rcp) - internal) + \ + (val << precision)) >> weight_rcp : \ + (val << precision); \ + } + +/* </DECLARE_EWMA> */

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2018