commits March 2019

commits@lists.open-mesh.org

1 participants
63 discussions

[openwrt-feed-devel] master: batman-adv-devel: Drop compat-hack for nla_put_u64_64bit (4201c39)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 4201c39d56fe58bc2ebb272080a335bb231ae045 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 22 20:19:42 2019 +0100 batman-adv-devel: Drop compat-hack for nla_put_u64_64bit nla_put_u64_64bit is already defined by the mac80211's backports and doesn't have to be redefined in the compat-hacks.h. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 4201c39d56fe58bc2ebb272080a335bb231ae045 batman-adv-devel/src/compat-hacks.h | 93 ------------------------------------- 1 file changed, 93 deletions(-) diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h index 217f4d1..c2e6e31 100644 --- a/batman-adv-devel/src/compat-hacks.h +++ b/batman-adv-devel/src/compat-hacks.h @@ -105,99 +105,6 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev, #endif /* < KERNEL_VERSION(4, 6, 0) */ -#include_next <linux/netlink.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) - -#include_next <net/netlink.h> - -static inline bool batadv_nla_need_padding_for_64bit(struct sk_buff *skb); - -static inline int batadv_nla_align_64bit(struct sk_buff *skb, int padattr) -{ - if (batadv_nla_need_padding_for_64bit(skb) && - !nla_reserve(skb, padattr, 0)) - return -EMSGSIZE; - - return 0; -} - -static inline struct nlattr *batadv__nla_reserve_64bit(struct sk_buff *skb, - int attrtype, - int attrlen, int padattr) -{ - if (batadv_nla_need_padding_for_64bit(skb)) - batadv_nla_align_64bit(skb, padattr); - - return __nla_reserve(skb, attrtype, attrlen); -} - -static inline void batadv__nla_put_64bit(struct sk_buff *skb, int attrtype, - int attrlen, const void *data, - int padattr) -{ - struct nlattr *nla; - - nla = batadv__nla_reserve_64bit(skb, attrtype, attrlen, padattr); - memcpy(nla_data(nla), data, attrlen); -} - -static inline bool batadv_nla_need_padding_for_64bit(struct sk_buff *skb) -{ -#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS - /* The nlattr header is 4 bytes in size, that's why we test - * if the skb->data _is_ aligned. A NOP attribute, plus - * nlattr header for next attribute, will make nla_data() - * 8-byte aligned. - */ - if (IS_ALIGNED((unsigned long)skb_tail_pointer(skb), 8)) - return true; -#endif - return false; -} - -static inline int batadv_nla_total_size_64bit(int payload) -{ - return NLA_ALIGN(nla_attr_size(payload)) -#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS - + NLA_ALIGN(nla_attr_size(0)) -#endif - ; -} - -static inline int batadv_nla_put_64bit(struct sk_buff *skb, int attrtype, - int attrlen, const void *data, - int padattr) -{ - size_t len; - - if (batadv_nla_need_padding_for_64bit(skb)) - len = batadv_nla_total_size_64bit(attrlen); - else - len = nla_total_size(attrlen); - if (unlikely(skb_tailroom(skb) < len)) - return -EMSGSIZE; - - batadv__nla_put_64bit(skb, attrtype, attrlen, data, padattr); - 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, - u64 value, int padattr) -{ - return batadv_nla_put_64bit(skb, attrtype, sizeof(u64), &value, - padattr); -} - -#endif /* < KERNEL_VERSION(4, 7, 0) */ - - #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) #include_next <linux/cache.h>

1 0

[openwrt-feed-devel] master: batman-adv-devel: Allow to use BATMAN_ADV_DEBUG without BATMAN_ADV_DEBUGFS (9f58031)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 9f58031ddea587d9e42cba039f066d3dfb926655 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 27 16:28:23 2019 +0100 batman-adv-devel: Allow to use BATMAN_ADV_DEBUG without BATMAN_ADV_DEBUGFS The BATMAN_ADV_DEBUGFS portion of batman-adv is marked as deprecated. Thus all required functionality should be available without it. The debug log was already modified to also output via the kernel tracing function but still retained its BATMAN_ADV_DEBUGFS functionality. Separate the entry point for the debug log from the debugfs portions to make it possible to build with BATMAN_ADV_DEBUG and without BATMAN_ADV_DEBUGFS. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 9f58031ddea587d9e42cba039f066d3dfb926655 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 d658129..0f123f6 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -90,7 +90,7 @@ config BATMAN_ADV_DEVEL_DEBUGFS config BATMAN_ADV_DEVEL_DEBUG bool "B.A.T.M.A.N. debugging" - depends on BATMAN_ADV_DEVEL_DEBUGFS + depends on PACKAGE_kmod-batman-adv-devel help This is an option for use by developers; most people should say N here. This enables compilation of support for

1 0

[openwrt-feed-devel] master: batman-adv-devel: Add uaccess compat code for 2 and 3 args uaccess function (167c089)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 167c089703edec5b4e7ed5e49e093a6b080e11be Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 27 16:28:23 2019 +0100 batman-adv-devel: Add uaccess compat code for 2 and 3 args uaccess function The kernels 3.16-3.18 use the 3-arguments access_ok macro in header files. When we remove this version, the build will fail on these kernels. with: include/net/sock.h:1818:22: error: macro "access_ok" passed 3 arguments, but takes just 2 In file included from net/batman-adv/bridge_loop_avoidance.c:52:0: include/net/sock.h: In function ‘skb_do_copy_data_nocache’: include/net/sock.h:1818:41: error: macro "access_ok" passed 3 arguments, but takes just 2 if (!access_ok(VERIFY_READ, from, copy) || ^ include/net/sock.h:1818:8: error: ‘access_ok’ undeclared (first use in this function) if (!access_ok(VERIFY_READ, from, copy) || ^~~~~~~~~ Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 167c089703edec5b4e7ed5e49e093a6b080e11be batman-adv-devel/src/compat-hacks.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h index 4511184..718a15c 100644 --- a/batman-adv-devel/src/compat-hacks.h +++ b/batman-adv-devel/src/compat-hacks.h @@ -348,6 +348,27 @@ typedef unsigned __poll_t; #endif /* < KERNEL_VERSION(4, 16, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) + +static inline int batadv_access_ok(int type, const void __user *p, + unsigned long size) +{ + return access_ok(type, p, size); +} + +#ifdef access_ok +#undef access_ok +#endif + +#define access_ok_get(_1, _2, _3 , access_ok_name, ...) access_ok_name +#define access_ok(...) \ + access_ok_get(__VA_ARGS__, access_ok3, access_ok2)(__VA_ARGS__) + +#define access_ok2(addr, size) batadv_access_ok(VERIFY_WRITE, (addr), (size)) +#define access_ok3(type, addr, size) batadv_access_ok((type), (addr), (size)) + +#endif /* < KERNEL_VERSION(5, 0, 0) */ + /* <DECLARE_EWMA> */ #include <linux/version.h>

1 0

[openwrt-feed-devel] master: batman-adv-devel: use batctl for configuration (5b98583)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 5b98583e58be97d380d4ed32dd68a7c2dbbe73ce Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 6 13:24:21 2019 +0100 batman-adv-devel: use batctl for configuration The batctl binary is currently optional for batman-adv installations. But new configuration settings will only be exposed via generic netlink. The batctl tool will therefore be required to modify them. batctl must therefore no longer depend on batman-adv but batman-adv must depend on batctl. Some already implemented settings are already moved to batctl. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 5b98583e58be97d380d4ed32dd68a7c2dbbe73ce batctl-devel/Makefile | 2 +- batman-adv-devel/Makefile | 2 +- batman-adv-devel/files/lib/batman-adv/config.sh | 48 +++++++++++++++------- batman-adv-devel/files/lib/netifd/proto/batadv.sh | 9 ++-- .../files/lib/netifd/proto/batadv_vlan.sh | 6 +-- 5 files changed, 42 insertions(+), 25 deletions(-) diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile index 340c316..c22b1bd 100644 --- a/batctl-devel/Makefile +++ b/batctl-devel/Makefile @@ -41,7 +41,7 @@ define Package/batctl-devel URL:=https://www.open-mesh.org/ SECTION:=net CATEGORY:=Network - DEPENDS:=+kmod-batman-adv-devel +libnl-tiny +libc +librt + DEPENDS:=+libnl-tiny +libc +librt PROVIDES:=batctl-devel MAINTAINER:=Simon Wunderlich <sw(a)simonwunderlich.de> TITLE:=B.A.T.M.A.N. Advanced user space configuration tool (Default) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 7dd42b7..bede8cc 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -41,7 +41,7 @@ define KernelPackage/batman-adv-devel URL:=https://www.open-mesh.org/ MAINTAINER:=Simon Wunderlich <sw(a)simonwunderlich.de> SUBMENU:=Network Support - DEPENDS:=+BATMAN_ADV_DEVEL_BLA:kmod-lib-crc16 +kmod-lib-crc32c +kmod-cfg80211 + DEPENDS:=+BATMAN_ADV_DEVEL_BLA:kmod-lib-crc16 +kmod-lib-crc32c +kmod-cfg80211 +batctl-devel TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoProbe,batman-adv) diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 3a746a3..952f93e 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -33,19 +33,37 @@ bat_config() [ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1 - [ -n "$aggregated_ogms" ] && echo $aggregated_ogms > /sys/class/net/$mesh/mesh/aggregated_ogms - [ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation - [ -n "$bonding" ] && echo $bonding > /sys/class/net/$mesh/mesh/bonding - [ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance 2>&- - [ -n "$distributed_arp_table" ] && echo $distributed_arp_table > /sys/class/net/$mesh/mesh/distributed_arp_table 2>&- - [ -n "$fragmentation" ] && echo $fragmentation > /sys/class/net/$mesh/mesh/fragmentation - [ -n "$gw_bandwidth" ] && echo $gw_bandwidth > /sys/class/net/$mesh/mesh/gw_bandwidth - [ -n "$gw_mode" ] && echo $gw_mode > /sys/class/net/$mesh/mesh/gw_mode - [ -n "$gw_sel_class" ] && echo $gw_sel_class > /sys/class/net/$mesh/mesh/gw_sel_class - [ -n "$hop_penalty" ] && echo $hop_penalty > /sys/class/net/$mesh/mesh/hop_penalty - [ -n "$isolation_mark" ] && echo $isolation_mark > /sys/class/net/$mesh/mesh/isolation_mark - [ -n "$multicast_mode" ] && echo $multicast_mode > /sys/class/net/$mesh/mesh/multicast_mode 2>&- - [ -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 "$aggregated_ogms" ] && batctl -m "$mesh" aggregation "$aggregated_ogms" + [ -n "$ap_isolation" ] && batctl -m "$mesh" ap_isolation "$ap_isolation" + [ -n "$bonding" ] && batctl -m "$mesh" bonding "$bonding" + [ -n "$bridge_loop_avoidance" ] && batctl -m "$mesh" bridge_loop_avoidance "$bridge_loop_avoidance" 2>&- + [ -n "$distributed_arp_table" ] && batctl -m "$mesh" distributed_arp_table "$distributed_arp_table" 2>&- + [ -n "$fragmentation" ] && batctl -m "$mesh" fragmentation "$fragmentation" + + case "$gw_mode" in + server) + if [ -n "$gw_bandwidth" ]; then + batctl -m "$mesh" gw_mode "server" "$gw_bandwidth" + else + batctl -m "$mesh" gw_mode "server" + fi + ;; + client) + if [ -n "$gw_sel_class" ]; then + batctl -m "$mesh" gw_mode "client" "$gw_sel_class" + else + batctl -m "$mesh" gw_mode "client" + fi + ;; + *) + batctl -m "$mesh" gw_mode "off" + ;; + esac + + [ -n "$hop_penalty" ] && batctl -m "$mesh" hop_penalty "$hop_penalty" + [ -n "$isolation_mark" ] && batctl -m "$mesh" isolation_mark "$isolation_mark" + [ -n "$multicast_mode" ] && batctl -m "$mesh" multicast_mode "$multicast_mode" 2>&- + [ -n "$network_coding" ] && batctl -m "$mesh" network_coding "$network_coding" 2>&- + [ -n "$log_level" ] && batctl -m "$mesh" loglevel "$log_level" 2>&- + [ -n "$orig_interval" ] && batctl -m "$mesh" orig_interval "$orig_interval" } diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv.sh b/batman-adv-devel/files/lib/netifd/proto/batadv.sh index 1e0c9d0..2233091 100755 --- a/batman-adv-devel/files/lib/netifd/proto/batadv.sh +++ b/batman-adv-devel/files/lib/netifd/proto/batadv.sh @@ -17,9 +17,9 @@ proto_batadv_setup() { json_get_vars mesh routing_algo [ -n "$routing_algo" ] || routing_algo="BATMAN_IV" - echo "$routing_algo" > "/sys/module/batman_adv/parameters/routing_algo" + batctl routing_algo "$routing_algo" - echo "$mesh" > "/sys/class/net/$iface/batman_adv/mesh_iface" + batctl -m "$mesh" interface add "$iface" proto_init_update "$iface" 1 proto_send_update "$config" } @@ -28,7 +28,10 @@ proto_batadv_teardown() { local config="$1" local iface="$2" - echo "none" > "/sys/class/net/$iface/batman_adv/mesh_iface" || true + local mesh + json_get_vars mesh + + batctl -m "$mesh" interface del "$iface" || true } add_protocol batadv diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh b/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh index 85002c3..d6d00ad 100755 --- a/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh +++ b/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh @@ -12,16 +12,12 @@ proto_batadv_vlan_setup() { local config="$1" local iface="$2" - # VLAN specific variables - local device="${iface%.*}" - local vid="${iface#*.}" - # batadv_vlan options local ap_isolation json_get_vars ap_isolation - echo "$ap_isolation" > "/sys/class/net/${device}/mesh/vlan${vid}/ap_isolation" + batctl -m "$iface" ap_isolation "$ap_isolation" proto_init_update "$iface" 1 proto_send_update "$config" }

1 0

[openwrt-feed-devel] master: batctl-devel: Provide different build variants (fc8e2c4)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit fc8e2c44bc079fdcea594899451388352c98e780 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 6 13:23:42 2019 +0100 batctl-devel: Provide different build variants The batctl binary is currently optional for batman-adv installations. But new configuration settings will only be exposed via generic netlink. The batctl tool will therefore be required to modify them. To also fit batctl in some of the smaller devices, a new variant tiny is build which only provides the settings subcommands. The default variant is equal to the old batctl package and full also provides the commands which were disabled until now. There are no actual variant package builds but only a configuration settings. The actual openwrt-routing package requires variant package builds but this would conflict with the per package build settings of the batctl-devel package. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- fc8e2c44bc079fdcea594899451388352c98e780 batctl-devel/Config.devel.in | 35 ++++++++----- batctl-devel/Makefile | 121 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 141 insertions(+), 15 deletions(-) diff --git a/batctl-devel/Config.devel.in b/batctl-devel/Config.devel.in index fbdd9a9..5aa9810 100644 --- a/batctl-devel/Config.devel.in +++ b/batctl-devel/Config.devel.in @@ -1,6 +1,24 @@ -if PACKAGE_batctl-devel +choice + depends on PACKAGE_batctl-devel + + prompt "Build variant" + default default + + config batctl-devel_tiny + bool "tiny" + + config batctl-devel_default + bool "default" + + config batctl-devel_full + bool "full" + +endchoice + choice + depends on PACKAGE_batctl-devel + prompt "Selected batctl-devel download method" default batctl-devel_SOURCE_GIT @@ -12,14 +30,11 @@ choice endchoice -endif - -if batctl-devel_SOURCE_GIT config batctl-devel_REPOSITORY string prompt "batctl-devel repository to build" - depends on PACKAGE_batctl-devel + depends on batctl-devel_SOURCE_GIT default "https://git.open-mesh.org/batctl.git" help Enter a batctl-devel repository url @@ -27,24 +42,18 @@ config batctl-devel_REPOSITORY config batctl-devel_BRANCH string prompt "batctl-devel branch to build" - depends on PACKAGE_batctl-devel + depends on batctl-devel_SOURCE_GIT default "master" help Enter a batctl branch name or git tag to override package default value. This allows to build from non-master branches to test unreleased features. -endif - - -if batctl-devel_SOURCE_DIRECTORY config batctl-devel_DIRECTORY string prompt "batctl-devel source directory" - depends on PACKAGE_batctl-devel + depends on batctl-devel_SOURCE_DIRECTORY default "/tmp/batctl-devel" help Enter a batctl-devel source directory - -endif diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile index 45d61f5..340c316 100644 --- a/batctl-devel/Makefile +++ b/batctl-devel/Makefile @@ -33,6 +33,8 @@ PKG_LICENSE:=GPL-2.0 PKG_REV?=0 PKG_VERSION?=0.$(PKG_REV) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/batctl-devel @@ -40,8 +42,9 @@ define Package/batctl-devel SECTION:=net CATEGORY:=Network DEPENDS:=+kmod-batman-adv-devel +libnl-tiny +libc +librt - TITLE:=B.A.T.M.A.N. Advanced user space configuration tool batctl + PROVIDES:=batctl-devel MAINTAINER:=Simon Wunderlich <sw(a)simonwunderlich.de> + TITLE:=B.A.T.M.A.N. Advanced user space configuration tool (Default) endef define Package/batctl-devel/description @@ -82,6 +85,119 @@ MAKE_BATCTL_ARGS += \ batctl install \ REVISION="openwrt-$(PKG_VERSION)" +config-n := \ + aggregation \ + ap_isolation \ + backbonetable \ + bisect_iv \ + bonding \ + bridge_loop_avoidance \ + claimtable \ + dat_cache \ + distributed_arp_table \ + event \ + fragmentation \ + gateways \ + gw_mode \ + hop_penalty \ + interface \ + isolation_mark \ + log \ + loglevel \ + mcast_flags \ + multicast_mode \ + nc_nodes \ + neighbors \ + network_coding \ + orig_interval \ + originators \ + ping \ + routing_algo \ + statistics \ + tcpdump \ + throughputmeter \ + traceroute \ + transglobal \ + translate \ + translocal \ + +config-settings := \ + aggregation \ + ap_isolation \ + bonding \ + bridge_loop_avoidance \ + distributed_arp_table \ + fragmentation \ + gw_mode \ + hop_penalty \ + interface \ + isolation_mark \ + loglevel \ + multicast_mode \ + network_coding \ + orig_interval \ + routing_algo \ + +config-tables := \ + backbonetable \ + claimtable \ + dat_cache \ + gateways \ + loglevel \ + nc_nodes \ + neighbors \ + originators \ + statistics \ + transglobal \ + translocal \ + +config-tools := \ + event \ + log \ + ping \ + tcpdump \ + throughputmeter \ + traceroute \ + translate \ + +config-extratools := \ + bisect_iv \ + +ifdef CONFIG_batctl-devel_tiny + +config-y := \ + $(config-settings) \ + +endif + +ifdef CONFIG_batctl-devel_default + +config-y := \ + $(config-settings) \ + $(config-tables) \ + $(config-tools) \ + +endif + +ifdef CONFIG_batctl-devel_full + +config-y := \ + $(config-settings) \ + $(config-tables) \ + $(config-tools) \ + $(config-extratools) \ + +endif + +define ConfigVars +$(subst $(space),,$(foreach opt,$(config-$(1)),CONFIG_$(opt)=$(1) +)) +endef + +define batctl_config +$(call ConfigVars,n)$(call ConfigVars,y) +endef +$(eval $(call shexport,batctl_config)) ifdef CONFIG_batctl-devel_SOURCE_DIRECTORY @@ -94,7 +210,8 @@ endef endif define Build/Compile - $(MAKE_BATCTL_ENV) $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATCTL_ARGS) + $(MAKE_BATCTL_ENV) $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATCTL_ARGS) \ + $$$$$(call shvar,batctl_config) endef define Package/batctl-devel/install

1 0

[batman-adv] master: batman-adv: Fix genl notification for throughput_override (d9790b4c)
by postmaster＠open-mesh.org 05 Mar '19

05 Mar '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d9790b4c1bfe8e8603eb84ae550f2e1716aa7db8 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Mar 3 19:25:26 2019 +0100 batman-adv: Fix genl notification for throughput_override The throughput_override sysfs file is not below the meshif but below a hardif. The kobj has therefore not a pointer which can be used to find the batadv_priv data. The pointer stored in the hardif object must be used instead to find the correct meshif private data. Fixes: 68e981a3a261 ("batman-adv: Trigger genl notification on sysfs config change") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- d9790b4c1bfe8e8603eb84ae550f2e1716aa7db8 net/batman-adv/sysfs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 0b4b3fb7..208655cf 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -1116,9 +1116,9 @@ static ssize_t batadv_store_throughput_override(struct kobject *kobj, struct attribute *attr, char *buff, size_t count) { - struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj); struct net_device *net_dev = batadv_kobj_to_netdev(kobj); struct batadv_hard_iface *hard_iface; + struct batadv_priv *bat_priv; u32 tp_override; u32 old_tp_override; bool ret; @@ -1147,7 +1147,10 @@ static ssize_t batadv_store_throughput_override(struct kobject *kobj, atomic_set(&hard_iface->bat_v.throughput_override, tp_override); - batadv_netlink_notify_hardif(bat_priv, hard_iface); + if (hard_iface->soft_iface) { + bat_priv = netdev_priv(hard_iface->soft_iface); + batadv_netlink_notify_hardif(bat_priv, hard_iface); + } out: batadv_hardif_put(hard_iface);

1 0

[linux-merge]linux integration; annotated tag, v4.20.13, created. v4.20.13
by postmaster＠open-mesh.org 04 Mar '19

04 Mar '19

The annotated tag, v4.20.13 has been created at b55391225faec1ac92873d1ef6ec546df7e3320c (tag) tagging 0f7c162c1df596e0bba04c26fc9cc497983bf32b (commit) replaces v4.20 tagged by Greg Kroah-Hartman on Wed Feb 27 10:09:58 2019 +0100 - Shortlog ------------------------------------------------------------ This is the 4.20.13 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlx2U+YACgkQONu9yGCS aT6gNQ//cD2xYWpj6DhWp7tY2i3p5oQ0KJy3xNphMzx6TYT995QLOb+UV9jVTFW4 7hfppxT77JtyNkKvXqtxK9pUtvskwJDnDbElr+ylp7jb8xQyXfllzsk7Losi9aba n56UJWCtv37o0v4EYLnRvPXQx0mcGMO1Rgk6sm0tLTuc/CiFGWW70GTj62Qsjd6/ pS41PIkEY/t3+yzGcFl2dscaKwziUY/nLfcsPZFou8bayoG+GGXAXurckh1/mtFn TBGDlRftdzvBoGsuUgR2/fO2appYn3LwR76X8H4MxQxDLBMORCbCJysdwsB+Mvs4 CfjkOfGzDpqmlpRyGXmBtDoQKbHTmixdbmPmHa7QZLzSzRIBO20TWzTrdHOb4WDx bLSl4Ay3JEr8mg2A/0+n1Hy0Jaq2LfwoR7iR6RLCXSdaJzLnmJkSLgGC7EyvNKc8 G/HKzn7eVfSU/GfjzLE24DlONy1jz3VcjKTbqjeB4Nk8jCqxRmTK4F+/+uKrD2fr G3fNLnOa3SbQNI3moBeJUDp5HJxTNN93I+xJOcdCVHGgfzpbQeZRaa/06i/wO+e9 vD+g0v33R7SJcYCJk+E5PqnAAiDlR3UjCni6mp7R5pXb++y3j8OGKmZK0r/MrB1w OEzpuJyTHuvjyFB0yu8IrpmDIA7LvuEMnT/0Vtn8ojraiNSYO74= =s6Z9 -----END PGP SIGNATURE----- Eric Dumazet (1): batman-adv: fix uninit-value in batadv_interface_tx() Sven Eckelmann (2): batman-adv: Avoid WARN on net_device without parent in netns batman-adv: Force mac header to start of data on xmit ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.19.26, created. v4.19.26
by postmaster＠open-mesh.org 04 Mar '19

04 Mar '19

The annotated tag, v4.19.26 has been created at f8ec22ee493094505db66ddfb5d4f4685b0f6bcc (tag) tagging 51ea85abe794450e24352b970c33ed12f0e13a4c (commit) replaces v4.19.13 tagged by Greg Kroah-Hartman on Wed Feb 27 10:09:03 2019 +0100 - Shortlog ------------------------------------------------------------ This is the 4.19.26 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlx2U68ACgkQONu9yGCS aT6rHA/+PGrMAAzSp193bme2rap7P/EzDD0JF0aQOLwizdit5A4zIYSZApVVSaw5 U8KIQg+fcwIjTvzBmkHddDVVJBEv/VdE8Xkf0EOIOidIQNqMoRQN7ctU1bnKfUyC 20/xZBlc78BEU4TB4JpNiKkzD3bsl/Gsb2A3VenhHe0H8dbj4oJYyNWWY99/433y u1SNmTogLJ0p64+1XWMCTqPJA2xkUIOciFSLiO7d51MfpbguMwcW+T9XSwYat3tp uTdfvZYKc4iGPa4pZCZmZY7+Lrxne2OjMhp3bUlp0coKrjlNO848X+kG7gsVZ7EN MA7YOXUj/Ngjl+E9EilNY5gybY2hK0IzaaV8W9TRVYvPBjgSwe5Mj9/EXYO0L8q0 Arla5HsJdRhLX7HDJ41w8BIngko87hetAaTZVCct+F+nnMYGrrMsle+BgYYbnd7r NYWB8HwZZ3krkWmAZb+Phpleo3Oj7beum5MLoydSH4pXhTVft5D/V8K2fwLmZtgP FsIC1J09jDvXJ5qHTFBY4ugTq8l21YZ2oMPdwcB6X8hBIKji4XydQ0HPrdMyAtXB tqUkzyLZlP1uzm9T3E+hyATWeM4ue7qLFacp7cX5LokDWIxlWi7tcIqBHqRZez+y S7un8/Lmz8ZvzC674JTZl1iXSHuuK6TFLrwI3mw/CVhg2qRvZtk= =EDHP -----END PGP SIGNATURE----- Eric Dumazet (1): batman-adv: fix uninit-value in batadv_interface_tx() Sven Eckelmann (2): batman-adv: Avoid WARN on net_device without parent in netns batman-adv: Force mac header to start of data on xmit ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.14.104, created. v4.14.104
by postmaster＠open-mesh.org 04 Mar '19

04 Mar '19

The annotated tag, v4.14.104 has been created at 85971cb5a100fce32573592646e0eab9389bce0d (tag) tagging 30921fc1e5fcf904f9afddeece1288f5b16ba017 (commit) replaces v4.14.91 tagged by Greg Kroah-Hartman on Wed Feb 27 10:08:09 2019 +0100 - Shortlog ------------------------------------------------------------ This is the 4.14.104 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlx2U3kACgkQONu9yGCS aT6ocg//RY5zNiVm1frgw1M6HrUUfPO0nXMs67X93sIZ+Iwym5gUBWAK9wfyLn/h 7G5bGnKya9IS1ltU1Z2fwaIt+N7Wnih3sMk/6ypmf4VdDVE2mGrML0D3nPW7fO3A iiXzdixDQlt/VHNB2CXg/z0a7cvtw6ZNF+69QR+plHEGgy40tNvIYPbeCMgfKBAk hkv1BjN3SdHzM0CbIDBx/Wq/kFP/pUEcmVJ0gafdZiYAQM69nkQvFcoSslASfbP4 /VP1vlXO0EINgGn8u6/C+iGoGbPYCXOcwafUXEFVh2bQML4IfOiX1mGE3ve5Pe5Z ooYbbhsyKfEtclNfBKUjuTfdrkHBedyoeohkEhzDzpQBpeoW3yp5y/1sTdIMHeHs j4L1qmgX3QfWrJXyaBWKaHOQjK+rpZPfbt+pfxE9l8+M+6jzHtnmabVdjxZ70LNn YySa4eCW57HIV3Z3aMDL9fWNEAYxsXNtfc0h9rh0Byery44HNDAAeBaVSDsZFcbI uLslCcKWNyJ/52Z+XkFWKzSYKHdpe2TvPzsDllokE7OpCRF35Wsdsf6V0LJrOXRO t5O4t6rimhCF/Icd1oJmyV/SmDd8yrw3tE9JBdzZEmlBZpKDP0UCx8fMsQNPgE8y NmKeDp0L4w44PBeTjqSrE8Q3o6BdtWsZEXz3x+zmkLyiZ7N6mzc= =ODN3 -----END PGP SIGNATURE----- Eric Dumazet (1): batman-adv: fix uninit-value in batadv_interface_tx() Sven Eckelmann (2): batman-adv: Avoid WARN on net_device without parent in netns batman-adv: Force mac header to start of data on xmit ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.9.161, created. v4.9.161
by postmaster＠open-mesh.org 04 Mar '19

04 Mar '19

The annotated tag, v4.9.161 has been created at c284508af57a12ce6cd3758b9b22676a194c974f (tag) tagging 5507839a723e4edeed4efda2fa2249c4713fe0bb (commit) replaces v4.9.148 tagged by Greg Kroah-Hartman on Wed Feb 27 10:07:12 2019 +0100 - Shortlog ------------------------------------------------------------ This is the 4.9.161 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlx2U0AACgkQONu9yGCS aT6W1g//fNWwDub0IGC1rDim+yd40rvgSXz7JkZLi+vog90ucwmogIbK9BOMqZcn y1Sz6M43EpUOxP039tbVVah+ay6nN6v/Y/PZXLtBHjk6OqRfaY6RNvmsdrej8Trj cgVmsh9gohGLy3hcNz0hIcNrnOL4vAUvp2el56kOlkAZo1iascsuDKXFynlGsx9r d/RhNr5MnjdDCjOTTdVaoSnLCdmeFZSKvnPrvHYqYlLzJ5/SeGMqRK5i+SYkveHG OVL/OpadIwxTnCdwJLeYafSj4AL0nnhjDN9rTvrU4FWL6GKjCESBMaaMJA+e/Na7 l/PdytwJlHzr7PZYDvKZo3Rxq0R3+seUr1JxaUsBEJSuqNStEFG1RGwvm2JYW6M5 8NhFYDjHAtkZlTFUxEioku4Dy1UyvgaCHKMdUTUXMm3EMx8GKkeg0JBZwQqSvR4m xxCx1clekmGf9linQ2tg6iZQaH9r64sLER/kH3fqrhiMR2e70/C1tjLejochNsl7 pmrMtrmgq7r5UdBiGeROGuSV4iB9mLW+DpbmBmkS1aBBDz9l//AW2EXb5dbedPjQ HyMrZKyaDLxXcK0TF4s2qJI6+nzV6j9OAL9js8Ra+/AZO0ZGc19C4H2BJRh8yjcv r3RILeRySERFgyVS6SAmHdp4XDiN0FfZE8AFIMqf9PjSzAWTyj4= =LpSD -----END PGP SIGNATURE----- Eric Dumazet (1): batman-adv: fix uninit-value in batadv_interface_tx() Sven Eckelmann (2): batman-adv: Avoid WARN on net_device without parent in netns batman-adv: Force mac header to start of data on xmit ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2019