commits

commits@lists.open-mesh.org

1 participants
12421 discussions

[openwrt-feed-devel] master: batman-adv-devel: Drop cfg80211_get_station memset workaround (1739aba)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 1739aba722180fdc00271d7163b1c8b30d27e158 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 22 20:40:11 2019 +0100 batman-adv-devel: Drop cfg80211_get_station memset workaround The actual memset fix for cfg80211_get_station's sinfo is already part of the mac80211 package and doesn't have to be shipped anymore with batman-adv. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 1739aba722180fdc00271d7163b1c8b30d27e158 batman-adv-devel/src/compat-hacks.h | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h index 85c57be..cfeb348 100644 --- a/batman-adv-devel/src/compat-hacks.h +++ b/batman-adv-devel/src/compat-hacks.h @@ -146,28 +146,6 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev, #endif /* < KERNEL_VERSION(4, 15, 0) */ -#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) */ - -#endif /* < KERNEL_VERSION(4, 16, 0) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)

1 0

[openwrt-feed-devel] master: batman-adv-devel: Split batadv proto in meshif and hardif part (7d7df36)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 7d7df362a935df3495b84a5bf4270a872f375e7f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 24 17:51:13 2019 +0100 batman-adv-devel: Split batadv proto in meshif and hardif part batman-adv allows to configure three different objects: * batadv hardif - network interface used by batadv meshif to transport the batman-adv packets - its master interface is set to the batadv meshif * batadv (meshif/softif) - virtual interface that emulates a normal 802.3 interface on top - encapsulates traffic and forwards it via the batadv hardifs * batadv vlan - potential VLAN ID on top of batadv meshif - allows filtering of traffic from specific VIDs While batadv vlan objects were already represented as an own proto "batadv_vlan", the batadv meshif could never be fully configured using /etc/config/network. Instead, parts of its configuration were stored in /etc/config/batman_adv and some in the interfaces with the "batadv" proto. To increase the confusion, the "batadv" proto wasn't used to define the batadv meshif but to identify batadv (slave) hardifs. The batman-adv meshifs were also never created directly but only when a hardif was configured. The actual modification of the configuration settings was then applied using a hotplug script hack. The batadv meshif network interface could therefore only be created when an hardif was available and not manipulated with ifup/ifdown. Also `/etc/init.d/network reload` didn't modify the batadv meshif interface configuration correctly. The "batadv" is now renamed to "batadv_hardif" and a new "batadv" proto is used to configure the main (meshif) network interface with all its configuration. A simple network configuration with WiFi & ethernet interfaces and static IP on top of bat0 would look like: # batadv meshif bat0 config interface 'bat0' option proto 'batadv' option routing_algo 'BATMAN_IV' 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' # add *single* wifi-iface with network bat0_hardif_wlan as hardif to bat0 config interface 'bat0_hardif_wlan' option mtu '1536' option proto 'batadv_hardif' option master 'bat0' # option ifname is filled out by the wifi-iface # add eth0 as hardif to bat0 config interface 'bat0_hardif_eth0' option proto 'batadv_hardif' option master 'bat0' option ifname 'eth0' option mtu '1536' # configure IP on bat0 config interface 'bat0_lan' option ifname 'bat0' option proto 'static' option ipaddr '192.168.1.1' option netmask '255.255.255.0' option ip6assign '60' Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 7d7df362a935df3495b84a5bf4270a872f375e7f batman-adv-devel/files/etc/config/batman-adv | 20 ---- .../files/etc/hotplug.d/net/99-batman-adv | 12 --- .../etc/uci-defaults/99-migrate-batadv_hardif | 97 ++++++++++++++++++ batman-adv-devel/files/lib/batman-adv/config.sh | 69 ------------- batman-adv-devel/files/lib/netifd/proto/batadv.sh | 112 ++++++++++++++++++--- .../files/lib/netifd/proto/batadv_hardif.sh | 40 ++++++++ 6 files changed, 234 insertions(+), 116 deletions(-) diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv deleted file mode 100644 index 21138cb..0000000 --- a/batman-adv-devel/files/etc/config/batman-adv +++ /dev/null @@ -1,20 +0,0 @@ - -config 'mesh' 'bat0' - #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' diff --git a/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv b/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv deleted file mode 100644 index f0c391f..0000000 --- a/batman-adv-devel/files/etc/hotplug.d/net/99-batman-adv +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -. /lib/batman-adv/config.sh - -bat_load_module -config_load batman-adv - -case "$ACTION" in - add) - [ -d /sys/class/net/$INTERFACE/mesh/ ] && bat_config "$INTERFACE" - ;; -esac diff --git a/batman-adv-devel/files/etc/uci-defaults/99-migrate-batadv_hardif b/batman-adv-devel/files/etc/uci-defaults/99-migrate-batadv_hardif new file mode 100755 index 0000000..156a33f --- /dev/null +++ b/batman-adv-devel/files/etc/uci-defaults/99-migrate-batadv_hardif @@ -0,0 +1,97 @@ +#!/bin/sh + +# This UCI-Defaults script will split the batadv proto network interfaces +# in batadv_hardif and batadv proto. The configuration options from +# /etc/config/batman-adv will be moved to the latter. + +. /lib/functions.sh + +proto_batadv_to_batadv_hardif() { + local section="$1" + local proto + local mesh + local routing_algo + + config_get proto "${section}" proto + config_get mesh "${section}" mesh + config_get routing_algo "${section}" routing_algo + + if [ -z "$mesh" -o "${proto}" != "batadv" ]; then + continue + fi + + uci set network."${section}".proto="batadv_hardif" + uci rename network."${section}".mesh="master" + uci delete network."${section}".routing_algo + + # create new section or adjust existing one + uci set network."${mesh}"=interface + uci set network."${mesh}".proto=batadv + [ -n "${routing_algo}" ] && uci set network."${mesh}".routing_algo="${routing_algo}" +} + +mv_batadv_config_section() { + local section="$1" + local aggregated_ogms + local ap_isolation + local bonding + local bridge_loop_avoidance + local distributed_arp_table + local fragmentation + local gw_bandwidth + local gw_mode + local gw_sel_class + local hop_penalty + local isolation_mark + local log_level + local multicast_mode + local network_coding + local orig_interval + + config_get aggregated_ogms "${section}" aggregated_ogms + config_get ap_isolation "${section}" ap_isolation + config_get bonding "${section}" bonding + config_get bridge_loop_avoidance "${section}" bridge_loop_avoidance + config_get distributed_arp_table "${section}" distributed_arp_table + config_get fragmentation "${section}" fragmentation + config_get gw_bandwidth "${section}" gw_bandwidth + config_get gw_mode "${section}" gw_mode + config_get gw_sel_class "${section}" gw_sel_class + config_get hop_penalty "${section}" hop_penalty + config_get isolation_mark "${section}" isolation_mark + config_get log_level "${section}" log_level + config_get multicast_mode "${section}" multicast_mode + config_get network_coding "${section}" network_coding + config_get orig_interval "${section}" orig_interval + + # update section in case it exists + [ -n "${aggregated_ogms}" ] && uci set network."${section}".aggregated_ogms="${aggregated_ogms}" + [ -n "${ap_isolation}" ] && uci set network."${section}".ap_isolation="${ap_isolation}" + [ -n "${bonding}" ] && uci set network."${section}".bonding="${bonding}" + [ -n "${bridge_loop_avoidance}" ] && uci set network."${section}".bridge_loop_avoidance="${bridge_loop_avoidance}" + [ -n "${distributed_arp_table}" ] && uci set network."${section}".distributed_arp_table="${distributed_arp_table}" + [ -n "${fragmentation}" ] && uci set network."${section}".fragmentation="${fragmentation}" + [ -n "${gw_bandwidth}" ] && uci set network."${section}".gw_bandwidth="${gw_bandwidth}" + [ -n "${gw_mode}" ] && uci set network."${section}".gw_mode="${gw_mode}" + [ -n "${gw_sel_class}" ] && uci set network."${section}".gw_sel_class="${gw_sel_class}" + [ -n "${hop_penalty}" ] && uci set network."${section}".hop_penalty="${hop_penalty}" + [ -n "${isolation_mark}" ] && uci set network."${section}".isolation_mark="${isolation_mark}" + [ -n "${log_level}" ] && uci set network."${section}".log_level="${log_level}" + [ -n "${multicast_mode}" ] && uci set network."${section}".multicast_mode="${multicast_mode}" + [ -n "${network_coding}" ] && uci set network."${section}".network_coding="${network_coding}" + [ -n "${orig_interval}" ] && uci set network."${section}".orig_interval="${orig_interval}" +} + +if [ -f /etc/config/batman-adv ]; then + config_load network + config_foreach proto_batadv_to_batadv_hardif 'interface' + uci commit network + + config_load batman-adv + config_foreach mv_batadv_config_section 'mesh' + uci commit batman-adv + + rm -f /etc/config/batman-adv +fi + +exit 0 diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh deleted file mode 100644 index 952f93e..0000000 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh - -bat_load_module() -{ - [ -d "/sys/module/batman_adv/" ] && return - - . /lib/functions.sh - load_modules /etc/modules.d/*-crc16 /etc/modules.d/*-crypto* /etc/modules.d/*-lib-crc* /etc/modules.d/*-batman-adv* -} - -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 - - config_get aggregated_ogms "$mesh" aggregated_ogms - config_get ap_isolation "$mesh" ap_isolation - config_get bonding "$mesh" bonding - config_get bridge_loop_avoidance "$mesh" bridge_loop_avoidance - config_get distributed_arp_table "$mesh" distributed_arp_table - config_get fragmentation "$mesh" fragmentation - config_get gw_bandwidth "$mesh" gw_bandwidth - config_get gw_mode "$mesh" gw_mode - config_get gw_sel_class "$mesh" gw_sel_class - config_get hop_penalty "$mesh" hop_penalty - config_get isolation_mark "$mesh" isolation_mark - config_get multicast_mode "$mesh" multicast_mode - config_get network_coding "$mesh" network_coding - config_get log_level "$mesh" log_level - config_get orig_interval "$mesh" orig_interval - - [ ! -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" ] && 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 2233091..eb8153c 100755 --- a/batman-adv-devel/files/lib/netifd/proto/batadv.sh +++ b/batman-adv-devel/files/lib/netifd/proto/batadv.sh @@ -1,37 +1,119 @@ #!/bin/sh -. /lib/functions.sh -. ../netifd-proto.sh -init_proto "$@" +[ -n "$INCLUDE_ONLY" ] || { + . /lib/functions.sh + . ../netifd-proto.sh + init_proto "$@" +} proto_batadv_init_config() { - proto_config_add_string "mesh" - proto_config_add_string "routing_algo" + no_device=1 + available=1 + + proto_config_add_boolean 'aggregated_ogms:bool' + proto_config_add_boolean 'ap_isolation:bool' + proto_config_add_boolean 'bonding:bool' + proto_config_add_boolean 'bridge_loop_avoidance:bool' + proto_config_add_boolean 'distributed_arp_table:bool' + proto_config_add_boolean 'fragmentation:bool' + proto_config_add_string 'gw_bandwidth' + proto_config_add_string 'gw_mode' + proto_config_add_int 'gw_sel_class' + proto_config_add_int 'hop_penalty' + proto_config_add_string 'isolation_mark' + proto_config_add_string 'log_level' + proto_config_add_boolean 'multicast_mode:bool' + proto_config_add_boolean 'network_coding:bool' + proto_config_add_int 'orig_interval' + proto_config_add_string 'routing_algo' } proto_batadv_setup() { local config="$1" - local iface="$2" + local iface="$config" + + local aggregated_ogms + local ap_isolation + local bonding + local bridge_loop_avoidance + local distributed_arp_table + local fragmentation + local gw_bandwidth + local gw_mode + local gw_sel_class + local hop_penalty + local isolation_mark + local log_level + local multicast_mode + local network_coding + local orig_interval + local routing_algo + + json_get_vars aggregated_ogms + json_get_vars ap_isolation + json_get_vars bonding + json_get_vars bridge_loop_avoidance + json_get_vars distributed_arp_table + json_get_vars fragmentation + json_get_vars gw_bandwidth + json_get_vars gw_mode + json_get_vars gw_sel_class + json_get_vars hop_penalty + json_get_vars isolation_mark + json_get_vars log_level + json_get_vars multicast_mode + json_get_vars network_coding + json_get_vars orig_interval + json_get_vars routing_algo - local mesh routing_algo - json_get_vars mesh routing_algo + set_default routing_algo 'BATMAN_IV' - [ -n "$routing_algo" ] || routing_algo="BATMAN_IV" batctl routing_algo "$routing_algo" + batctl -m "$iface" interface create + + [ -n "$aggregated_ogms" ] && batctl -m "$iface" aggregation "$aggregated_ogms" + [ -n "$ap_isolation" ] && batctl -m "$iface" ap_isolation "$ap_isolation" + [ -n "$bonding" ] && batctl -m "$iface" bonding "$bonding" + [ -n "$bridge_loop_avoidance" ] && batctl -m "$iface" bridge_loop_avoidance "$bridge_loop_avoidance" 2>&- + [ -n "$distributed_arp_table" ] && batctl -m "$iface" distributed_arp_table "$distributed_arp_table" 2>&- + [ -n "$fragmentation" ] && batctl -m "$iface" fragmentation "$fragmentation" + + case "$gw_mode" in + server) + if [ -n "$gw_bandwidth" ]; then + batctl -m "$iface" gw_mode "server" "$gw_bandwidth" + else + batctl -m "$iface" gw_mode "server" + fi + ;; + client) + if [ -n "$gw_sel_class" ]; then + batctl -m "$iface" gw_mode "client" "$gw_sel_class" + else + batctl -m "$iface" gw_mode "client" + fi + ;; + *) + batctl -m "$iface" gw_mode "off" + ;; + esac + + [ -n "$hop_penalty" ] && batctl -m "$iface" hop_penalty "$hop_penalty" + [ -n "$isolation_mark" ] && batctl -m "$iface" isolation_mark "$isolation_mark" + [ -n "$multicast_mode" ] && batctl -m "$iface" multicast_mode "$multicast_mode" 2>&- + [ -n "$network_coding" ] && batctl -m "$iface" network_coding "$network_coding" 2>&- + [ -n "$log_level" ] && batctl -m "$iface" loglevel "$log_level" 2>&- + [ -n "$orig_interval" ] && batctl -m "$iface" orig_interval "$orig_interval" - batctl -m "$mesh" interface add "$iface" proto_init_update "$iface" 1 proto_send_update "$config" } proto_batadv_teardown() { local config="$1" - local iface="$2" - - local mesh - json_get_vars mesh + local iface="$config" - batctl -m "$mesh" interface del "$iface" || true + batctl -m "$iface" interface destroy } add_protocol batadv diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh b/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh new file mode 100755 index 0000000..9283d2b --- /dev/null +++ b/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +[ -n "$INCLUDE_ONLY" ] || { + . /lib/functions.sh + . ../netifd-proto.sh + init_proto "$@" +} + +proto_batadv_hardif_init_config() { + proto_config_add_string "master" +} + +proto_batadv_hardif_setup() { + local config="$1" + local iface="$2" + + local master + + json_get_vars master + + ( proto_add_host_dependency "$config" '' "$master" ) + + batctl -m "$master" interface -M add "$iface" + + proto_init_update "$iface" 1 + proto_send_update "$config" +} + +proto_batadv_hardif_teardown() { + local config="$1" + local iface="$2" + + local master + + json_get_vars master + + batctl -m "$master" interface -M del "$iface" || true +} + +add_protocol batadv_hardif

1 0

[openwrt-feed-devel] master: batman-adv-devel: simplify ip_mc_check_igmp() and ipv6_mc_check_mld() calls (501db53)
by postmaster＠open-mesh.org 09 Mar '19

09 Mar '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 501db53fc606e87b99ea653026dd511752ceca64 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 9 12:31:45 2019 +0100 batman-adv-devel: simplify ip_mc_check_igmp() and ipv6_mc_check_mld() calls The ip_mc_check_igmp and ipv6_mc_check_mld functions don't use the skb_trimmed parameter anymore. batman-adv was restructured to use the new kernel interface but the remaining parts of OpenWrt are still using the old function signature. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 501db53fc606e87b99ea653026dd511752ceca64 batman-adv-devel/src/compat-hacks.h | 38 +++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h index cfeb348..d8de483 100644 --- a/batman-adv-devel/src/compat-hacks.h +++ b/batman-adv-devel/src/compat-hacks.h @@ -48,9 +48,43 @@ struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb, unsigned int transport_len, __sum16(*skb_chkf)(struct sk_buff *skb)); -int ip_mc_check_igmp(struct sk_buff *skb, struct sk_buff **skb_trimmed); +int ip_mc_check_igmp(struct sk_buff *skb); +int ipv6_mc_check_mld(struct sk_buff *skb); -int ipv6_mc_check_mld(struct sk_buff *skb, struct sk_buff **skb_trimmed); +#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) + +#include_next <linux/igmp.h> +#include_next <net/addrconf.h> + +static inline int batadv_ipv6_mc_check_mld1(struct sk_buff *skb) +{ + return ipv6_mc_check_mld(skb, NULL); +} + +static inline int batadv_ipv6_mc_check_mld2(struct sk_buff *skb, + struct sk_buff **skb_trimmed) +{ + return ipv6_mc_check_mld(skb, skb_trimmed); +} + +#define ipv6_mc_check_mld_get(_1, _2, ipv6_mc_check_mld_name, ...) ipv6_mc_check_mld_name +#define ipv6_mc_check_mld(...) \ + ipv6_mc_check_mld_get(__VA_ARGS__, batadv_ipv6_mc_check_mld2, batadv_ipv6_mc_check_mld1)(__VA_ARGS__) + +static inline int batadv_ip_mc_check_igmp1(struct sk_buff *skb) +{ + return ip_mc_check_igmp(skb, NULL); +} + +static inline int batadv_ip_mc_check_igmp2(struct sk_buff *skb, + struct sk_buff **skb_trimmed) +{ + return ip_mc_check_igmp(skb, skb_trimmed); +} + +#define ip_mc_check_igmp_get(_1, _2, ip_mc_check_igmp_name, ...) ip_mc_check_igmp_name +#define ip_mc_check_igmp(...) \ + ip_mc_check_igmp_get(__VA_ARGS__, batadv_ip_mc_check_igmp2, batadv_ip_mc_check_igmp1)(__VA_ARGS__) #endif /* < KERNEL_VERSION(4, 2, 0) */

1 0

[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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits