commits October 2018

commits@lists.open-mesh.org

1 participants
63 discussions

[openwrt-feed-devel] master: batman-adv-devel: Load module with AutoProbe (606e820)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 606e82071b18e638322437bed3f9de532943178e Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jun 5 14:28:39 2018 +0200 batman-adv-devel: Load module with AutoProbe cfg80211 is loaded by kmodloader after the modules with a priority (AutoLoad) are loaded. batman-adv should therefore also be loaded at that time and must not load cfg80211 itself. The information in the ELF header are enough for kmodloader to load these two modules in the correct order. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 606e82071b18e638322437bed3f9de532943178e batman-adv-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index c7959fd..5faf275 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -30,7 +30,7 @@ define KernelPackage/batman-adv-devel DEPENDS:=+KMOD_BATMAN_ADV_DEVEL_BLA:kmod-lib-crc16 +kmod-crypto-crc32c +kmod-lib-crc32c +kmod-cfg80211 TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,50,cfg80211 batman-adv) + AUTOLOAD:=$(call AutoProbe,batman-adv) endef define KernelPackage/batman-adv-devel/description

1 0

[openwrt-feed-devel] master: batctl-devel: Drop unused clean rule (32b0523)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 32b0523c961817318342aeda467833449a20618f Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jul 17 21:10:47 2018 +0200 batctl-devel: Drop unused clean rule The rule can be removed because the OpenWrt build system takes care of the removal of the build directory. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 32b0523c961817318342aeda467833449a20618f batctl-devel/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile index e49993a..79f5d58 100644 --- a/batctl-devel/Makefile +++ b/batctl-devel/Makefile @@ -81,10 +81,6 @@ define Build/Compile $(MAKE_BATCTL_ENV) $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATCTL_ARGS) endef -define Build/Clean - rm -rf $(BUILD_DIR)/$(PKG_NAME)/ -endef - define Package/batctl-devel/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/batctl $(1)/usr/sbin/

1 0

[openwrt-feed-devel] master: batman-adv-devel: Remove deprecated compat helpers (a988bcd)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit a988bcdcbf4f74c2583d3ebffdb7e40373bbaa6a Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jun 8 13:58:53 2018 +0200 batman-adv-devel: Remove deprecated compat helpers Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- a988bcdcbf4f74c2583d3ebffdb7e40373bbaa6a batman-adv-devel/files/compat-hacks.h | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/files/compat-hacks.h index 0cf8e31..4511184 100644 --- a/batman-adv-devel/files/compat-hacks.h +++ b/batman-adv-devel/files/compat-hacks.h @@ -11,25 +11,7 @@ #endif /* < KERNEL_VERSION(4, 1, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) - -/* Linux 3.15 misses the uapi include.... */ -#include <uapi/linux/nl80211.h> - -#endif /* < KERNEL_VERSION(3, 16, 0) */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) - -#include <linux/netdevice.h> - -#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) ({\ - BUILD_BUG_ON(upper_priv != NULL); \ - BUILD_BUG_ON(upper_info != NULL); \ - BUILD_BUG_ON(extack != NULL); \ - netdev_set_master(dev, upper_dev); \ -}) - -#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) #include <linux/netdevice.h>

1 0

[openwrt-feed-devel] master: batman-adv-devel: Simplify installation of files (579b1e6)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 579b1e6a43fcd91fef7ba60d3794543c9572fc5b Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jul 17 21:20:14 2018 +0200 batman-adv-devel: Simplify installation of files It is not necessary to install each file manually to the target path. A simple recursive copy is enough. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 579b1e6a43fcd91fef7ba60d3794543c9572fc5b batman-adv-devel/Makefile | 7 +------ batman-adv-devel/files/lib/netifd/proto/batadv.sh | 0 batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh | 0 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 4da264f..411cf91 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -90,12 +90,7 @@ define Build/Compile 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 - $(INSTALL_DATA) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv - $(INSTALL_BIN) ./files/etc/hotplug.d/net/99-batman-adv $(1)/etc/hotplug.d/net - $(INSTALL_BIN) ./files/lib/netifd/proto/batadv.sh $(1)/lib/netifd/proto - $(INSTALL_BIN) ./files/lib/netifd/proto/batadv_vlan.sh $(1)/lib/netifd/proto + $(CP) ./files/. $(1)/ endef $(eval $(call KernelPackage,batman-adv-devel)) diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv.sh b/batman-adv-devel/files/lib/netifd/proto/batadv.sh old mode 100644 new mode 100755 diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh b/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh old mode 100644 new mode 100755

1 0

[openwrt-feed-devel] master: batman-adv-devel: Drop manual installation of compat-hacks.h (e6faa9f)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit e6faa9f65ad67c18cb76f563bdac4df65535032b Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jul 17 20:59:22 2018 +0200 batman-adv-devel: Drop manual installation of compat-hacks.h OpenWrt is able since a while to automatically install all files in ./src/ to the PKG_BUILD_DIR. It is no longer necessary to provide special Build/Prepare rules to do so. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e6faa9f65ad67c18cb76f563bdac4df65535032b batman-adv-devel/Makefile | 5 ----- batman-adv-devel/{files => src}/compat-hacks.h | 0 2 files changed, 5 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 5faf275..a7736ef 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -89,11 +89,6 @@ define Build/Compile modules endef -define Build/Prepare - $(call Build/Prepare/Default) - $(CP) ./files/compat-hacks.h $(PKG_BUILD_DIR)/ -endef - define Build/Clean rm -rf $(BUILD_DIR)/$(PKG_NAME)/ endef diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h similarity index 100% rename from batman-adv-devel/files/compat-hacks.h rename to batman-adv-devel/src/compat-hacks.h

1 0

[openwrt-feed-devel] master: batman-adv-devel: Remove unused option "interfaces" in config (701c416)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 701c416a5de5b4700bf2a54030788857fe7baeec Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jun 19 12:21:30 2018 +0200 batman-adv-devel: Remove unused option "interfaces" in config Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 701c416a5de5b4700bf2a54030788857fe7baeec batman-adv-devel/files/etc/config/batman-adv | 1 - 1 file changed, 1 deletion(-) diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index 97be622..6e6017a 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -18,4 +18,3 @@ config 'mesh' 'bat0' # yet another batX instance # config 'mesh' 'bat5' -# option 'interfaces' 'second_mesh'

1 0

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

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 06ded077d51319b5148f45cfab04432550791b34 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Dec 5 19:11:26 2017 +0100 batman-adv-devel: upgrade compat-hacks for release 2017.4 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 06ded077d51319b5148f45cfab04432550791b34 batman-adv-devel/files/compat-hacks.h | 40 +++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/files/compat-hacks.h index 9675ad8..a5277c8 100644 --- a/batman-adv-devel/files/compat-hacks.h +++ b/batman-adv-devel/files/compat-hacks.h @@ -22,9 +22,10 @@ #include <linux/netdevice.h> -#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) ({\ +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) ({\ BUILD_BUG_ON(upper_priv != NULL); \ BUILD_BUG_ON(upper_info != NULL); \ + BUILD_BUG_ON(extack != NULL); \ netdev_set_master(dev, upper_dev); \ }) @@ -32,12 +33,22 @@ #include <linux/netdevice.h> -#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) ({\ +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) ({\ BUILD_BUG_ON(upper_priv != NULL); \ BUILD_BUG_ON(upper_info != NULL); \ + BUILD_BUG_ON(extack != NULL); \ netdev_master_upper_dev_link(dev, upper_dev); \ }) +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + +#include <linux/netdevice.h> + +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) ({\ + BUILD_BUG_ON(extack != NULL); \ + netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info); \ +}) + #endif /* < KERNEL_VERSION(4, 5, 0) */ @@ -298,6 +309,31 @@ static inline void *batadv_skb_put_data(struct sk_buff *skb, const void *data, #endif /* < KERNEL_VERSION(4, 13, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + +#define batadv_softif_slave_add(__dev, __slave_dev, __extack) \ + batadv_softif_slave_add(__dev, __slave_dev) + +#endif /* < KERNEL_VERSION(4, 15, 0) */ + +#ifndef from_timer + +#define TIMER_DATA_TYPE unsigned long +#define TIMER_FUNC_TYPE void (*)(TIMER_DATA_TYPE) + +static inline void (struct timer_list *timer, + void (*callback)(struct timer_list *), + unsigned int flags) +{ + __setup_timer(timer, (TIMER_FUNC_TYPE)callback, + (TIMER_DATA_TYPE)timer, flags); +} + +#define from_timer(var, callback_timer, timer_fieldname) \ + container_of(callback_timer, typeof(*var), timer_fieldname) + +#endif /* !from_timer */ + /* <DECLARE_EWMA> */ #include <linux/version.h>

1 0

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

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 8f5ed347c9d82ed9e2913c00ab05cb76d96b1376 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jul 29 08:36:32 2017 +0200 batman-adv-devel: upgrade compat-hacks for release 2017.2 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 8f5ed347c9d82ed9e2913c00ab05cb76d96b1376 batman-adv-devel/files/compat-hacks.h | 62 +++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/files/compat-hacks.h index 8c8a889..4ae2bcc 100644 --- a/batman-adv-devel/files/compat-hacks.h +++ b/batman-adv-devel/files/compat-hacks.h @@ -11,6 +11,13 @@ #endif /* < KERNEL_VERSION(4, 1, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) + +/* Linux 3.15 misses the uapi include.... */ +#include <uapi/linux/nl80211.h> + +#endif /* < KERNEL_VERSION(3, 16, 0) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) #include <linux/netdevice.h> @@ -36,6 +43,11 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) +/* for batadv_v_elp_get_throughput which would have used + * STATION_INFO_EXPECTED_THROUGHPUT in Linux 4.0.0 + */ +#define NL80211_STA_INFO_EXPECTED_THROUGHPUT 28 + /* wild hack for batadv_getlink_net only */ #define get_link_net get_xstats_size || 1 ? fallback_net : (struct net*)netdev->rtnl_link_ops->get_xstats_size @@ -214,6 +226,56 @@ static inline int batadv_nla_put_u64_64bit(struct sk_buff *skb, int attrtype, #endif /* < KERNEL_VERSION(4, 10, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 9) + +#include <linux/netdevice.h> + +/* work around missing attribute needs_free_netdev and priv_destructor in + * net_device + */ +#define ether_setup(dev) \ + void batadv_softif_free2(struct net_device *dev) \ + { \ + batadv_softif_free(dev); \ + free_netdev(dev); \ + } \ + void (*t1)(struct net_device *dev) __attribute__((unused)); \ + bool t2 __attribute__((unused)); \ + ether_setup(dev) +#define needs_free_netdev destructor = batadv_softif_free2; t2 +#define priv_destructor destructor = batadv_softif_free2; t1 + +#endif /* < KERNEL_VERSION(4, 11, 9) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) + +static inline void *batadv_skb_put(struct sk_buff *skb, unsigned int len) +{ + return (void *)skb_put(skb, len); +} +#define skb_put batadv_skb_put + +static inline void *skb_put_zero(struct sk_buff *skb, unsigned int len) +{ + void *tmp = skb_put(skb, len); + + memset(tmp, 0, len); + + return tmp; +} + +static inline void *skb_put_data(struct sk_buff *skb, const void *data, + unsigned int len) +{ + void *tmp = skb_put(skb, len); + + memcpy(tmp, data, len); + + return tmp; +} + +#endif /* < KERNEL_VERSION(4, 13, 0) */ + /* <DECLARE_EWMA> */ #include <linux/version.h>

1 0

[openwrt-feed-devel] master: batman-adv-devel: Disable CONFIG_BATMAN_ADV_DEBUGFS by default (67be00d)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 67be00d254fc1c45ff956f6df009566bcab177d7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Jun 11 12:49:46 2018 +0200 batman-adv-devel: 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> >--------------------------------------------------------------- 67be00d254fc1c45ff956f6df009566bcab177d7 batman-adv-devel/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 2b42b7c..4df1528 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -17,7 +17,7 @@ config KMOD_BATMAN_ADV_DEVEL_DAT config KMOD_BATMAN_ADV_DEVEL_DEBUGFS bool "enable debugfs support" depends on PACKAGE_kmod-batman-adv-devel - default y + default n config KMOD_BATMAN_ADV_DEVEL_MCAST bool "enable multicast transmission optimization"

1 0

[openwrt-feed-devel] ecsv/master, master: batman-adv-devel: Remove non-existing setting "vis_mode" (1ae0f1d)
by postmaster＠open-mesh.org 07 Oct '18

07 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branches: ecsv/master,master >--------------------------------------------------------------- commit 1ae0f1d884d3bdcb4f7431b90c05f176d28a4325 Author: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Date: Mon Jan 30 14:52:25 2017 +0100 batman-adv-devel: Remove non-existing setting "vis_mode" There is no vis_mode in the batman-adv kernel module since batman-adv 2014.0.0. So don't expose such a setting in uci. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> >--------------------------------------------------------------- 1ae0f1d884d3bdcb4f7431b90c05f176d28a4325 batman-adv-devel/files/etc/config/batman-adv | 1 - batman-adv-devel/files/lib/batman-adv/config.sh | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index f38855e..97be622 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -9,7 +9,6 @@ config 'mesh' 'bat0' option 'gw_sel_class' option 'log_level' option 'orig_interval' - option 'vis_mode' option 'bridge_loop_avoidance' option 'distributed_arp_table' option 'multicast_mode' diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 1429a43..3039d3c 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -13,7 +13,7 @@ bat_config() local mesh="$1" local aggregated_ogms ap_isolation bonding bridge_loop_avoidance distributed_arp_table fragmentation local gw_bandwidth gw_mode gw_sel_class isolation_mark hop_penalty multicast_mode network_coding log_level - local orig_interval vis_mode + local orig_interval config_get aggregated_ogms "$mesh" aggregated_ogms config_get ap_isolation "$mesh" ap_isolation @@ -30,7 +30,6 @@ bat_config() config_get network_coding "$mesh" network_coding config_get log_level "$mesh" log_level config_get orig_interval "$mesh" orig_interval - config_get vis_mode "$mesh" vis_mode [ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1 @@ -49,5 +48,4 @@ bat_config() [ -n "$network_coding" ] && echo $network_coding > /sys/class/net/$mesh/mesh/network_coding 2>&- [ -n "$log_level" ] && echo $log_level > /sys/class/net/$mesh/mesh/log_level 2>&- [ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval - [ -n "$vis_mode" ] && echo $vis_mode > /sys/class/net/$mesh/mesh/vis_mode }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2018