From c1c1e134d6a45715eb105e27b74d7fda81176808 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Wed, 25 Jan 2017 10:03:30 +0100 Subject: [PATCH 1/6] alfred: Add sha256 PKG_HASH for LEDE Signed-off-by: Sven Eckelmann --- alfred/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/alfred/Makefile b/alfred/Makefile index b5d37ce..379c0fe 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -14,6 +14,7 @@ PKG_NAME:=alfred PKG_VERSION:=2016.5 PKG_RELEASE:=0 PKG_MD5SUM:=e03d422ed3b5a162b90e8af13389523f +PKG_HASH:=37b3babf7f37643cf296be11fb82d5730cf441a5a56f72fba96edae9f149c9d2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) From 7fce5dbf3696d82fea5fb66eff2e6c7d29a43916 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Wed, 25 Jan 2017 10:03:30 +0100 Subject: [PATCH 2/6] batctl: Add sha256 PKG_HASH for LEDE Signed-off-by: Sven Eckelmann --- batctl/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/batctl/Makefile b/batctl/Makefile index bf305a2..60c3dd9 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -12,6 +12,7 @@ PKG_NAME:=batctl PKG_VERSION:=2016.5 PKG_RELEASE:=0 PKG_MD5SUM:=7b33fb47c7fa5b317e9a152a286999fc +PKG_HASH:=07edeb1d87a548285be8c499542790a158fc8d94ef7ebb295f27ebf710024ae9 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) From 438114cc26e1ea24d20adab2b0afb9157de4e03f Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Wed, 25 Jan 2017 10:03:30 +0100 Subject: [PATCH 3/6] batman-adv: Add sha256 PKG_HASH for LEDE Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 4c8e740..59d1e6e 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -13,6 +13,7 @@ PKG_NAME:=batman-adv PKG_VERSION:=2016.5 PKG_RELEASE:=1 PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8 +PKG_HASH:=d0a0fc90c4f410b57d043215e253bb0b855efa5edbe165d87c17bfdcfafd0db7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) From 0e8b0976f5a475126ba3f66aefcb75963fcddccb Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Mon, 30 Jan 2017 14:37:37 +0100 Subject: [PATCH 4/6] batman-adv: add patches from 2016.4-maint 2017-01-04 * batman-adv: Decrease hardif refcnt on fragmentation send error Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 2 +- ...ase-hardif-refcnt-on-fragmentation-s.patch | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 59d1e6e..b33f368 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2016.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8 PKG_HASH:=d0a0fc90c4f410b57d043215e253bb0b855efa5edbe165d87c17bfdcfafd0db7 diff --git a/batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch b/batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch new file mode 100644 index 0000000..92da394 --- /dev/null +++ b/batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch @@ -0,0 +1,63 @@ +From: Sven Eckelmann +Date: Tue, 27 Dec 2016 08:51:17 +0100 +Subject: [PATCH] batman-adv: Decrease hardif refcnt on fragmentation send error + +An error before the hardif is found has to free the skb. But every error +after that has to free the skb + put the hard interface. + +Fixes: 8b4132b1447a ("batman-adv: Consume skb in batadv_frag_send_packet") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich +--- + net/batman-adv/fragmentation.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c +index 9c561e6..0854ebd 100644 +--- a/net/batman-adv/fragmentation.c ++++ b/net/batman-adv/fragmentation.c +@@ -474,7 +474,7 @@ int batadv_frag_send_packet(struct sk_buff *skb, + primary_if = batadv_primary_if_get_selected(bat_priv); + if (!primary_if) { + ret = -EINVAL; +- goto put_primary_if; ++ goto free_skb; + } + + /* Create one header to be copied to all fragments */ +@@ -502,7 +502,7 @@ int batadv_frag_send_packet(struct sk_buff *skb, + skb_fragment = batadv_frag_create(skb, &frag_header, mtu); + if (!skb_fragment) { + ret = -ENOMEM; +- goto free_skb; ++ goto put_primary_if; + } + + batadv_inc_counter(bat_priv, BATADV_CNT_FRAG_TX); +@@ -511,7 +511,7 @@ int batadv_frag_send_packet(struct sk_buff *skb, + ret = batadv_send_unicast_skb(skb_fragment, neigh_node); + if (ret != NET_XMIT_SUCCESS) { + ret = NET_XMIT_DROP; +- goto free_skb; ++ goto put_primary_if; + } + + frag_header.no++; +@@ -519,7 +519,7 @@ int batadv_frag_send_packet(struct sk_buff *skb, + /* The initial check in this function should cover this case */ + if (frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1) { + ret = -EINVAL; +- goto free_skb; ++ goto put_primary_if; + } + } + +@@ -527,7 +527,7 @@ int batadv_frag_send_packet(struct sk_buff *skb, + if (batadv_skb_head_push(skb, header_size) < 0 || + pskb_expand_head(skb, header_size + ETH_HLEN, 0, GFP_ATOMIC) < 0) { + ret = -ENOMEM; +- goto free_skb; ++ goto put_primary_if; + } + + memcpy(skb->data, &frag_header, header_size); From 6c1a1a066670d2ac61a6d1d30906c2ed4d3f280c Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Mon, 30 Jan 2017 14:46:03 +0100 Subject: [PATCH 5/6] batman-adv: Fix "aggregated_ogms" setting The new setting for aggregated_ogms was read from the correct config key. But the setting was applied to the wrong file. Also the value to set was not read from the correct variable. Reported-by: Edward Beech Fixes: 2d654c0af194 ("batman-adv: upgrade package to latest release 2012.0.0") Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 2 +- batman-adv/files/lib/batman-adv/config.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index b33f368..23dd732 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2016.5 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8 PKG_HASH:=d0a0fc90c4f410b57d043215e253bb0b855efa5edbe165d87c17bfdcfafd0db7 diff --git a/batman-adv/files/lib/batman-adv/config.sh b/batman-adv/files/lib/batman-adv/config.sh index 1429a43..e46628c 100644 --- a/batman-adv/files/lib/batman-adv/config.sh +++ b/batman-adv/files/lib/batman-adv/config.sh @@ -34,7 +34,7 @@ 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 "$aggregate_ogms" ] && echo $aggregate_ogms > /sys/class/net/$mesh/mesh/aggregate_ogms + [ -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>&- From 8a66ed185709df5b9120e602fda760969bebd632 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Mon, 30 Jan 2017 14:52:25 +0100 Subject: [PATCH 6/6] batman-adv: 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 --- batman-adv/files/etc/config/batman-adv | 1 - batman-adv/files/lib/batman-adv/config.sh | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/batman-adv/files/etc/config/batman-adv b/batman-adv/files/etc/config/batman-adv index f38855e..97be622 100644 --- a/batman-adv/files/etc/config/batman-adv +++ b/batman-adv/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/files/lib/batman-adv/config.sh b/batman-adv/files/lib/batman-adv/config.sh index e46628c..3a746a3 100644 --- a/batman-adv/files/lib/batman-adv/config.sh +++ b/batman-adv/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 }