forked from freifunk-franken/firmware
Adrian Schmutzler
b5b0557f13
Bump main repo, packages and routing repos. Refresh patches, drop upstreamed ones. Relevant highlights (v19.07.4 -> v19.07.5): - fix WAN disconnect issues on ath79 - fix 2.4 GHz MAC address for Unifi AC devices - use correct firmware for Unifi AP Relevant highlights (v19.07.3 -> v19.07.4): - add wpad-basic-wolfssl package - add support for CPE210 v3.2 - vxlan UDP checksum fix - squashfs: Fix compile with GCC 10 Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Reviewed-by: Fabian Bläse <fabian@blaese.de>
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From: Johannes Kimmel <fff@bareminimum.eu>
|
|
Date: Mon, 20 Jul 2020 08:05:09 +0200
|
|
Subject: vxlan: remove mandatory peeraddr
|
|
|
|
vxlan can be configured without a peer address. This is used to prepare
|
|
an interface and add peers later.
|
|
|
|
Fixes: FS#2743
|
|
|
|
Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
|
|
Acked-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
(cherry picked from commit 5222aadbf353b7cc030c39aa816f33951b104552)
|
|
|
|
diff --git a/package/network/config/vxlan/files/vxlan.sh b/package/network/config/vxlan/files/vxlan.sh
|
|
index 7b1c7039551b7781f5f7a8e73b964db698f3697b..bdcaa628c4416cc83258dd38a6fc0978ea55a3bb 100755
|
|
--- a/package/network/config/vxlan/files/vxlan.sh
|
|
+++ b/package/network/config/vxlan/files/vxlan.sh
|
|
@@ -55,12 +55,6 @@ proto_vxlan_setup() {
|
|
local ipaddr peeraddr
|
|
json_get_vars ipaddr peeraddr tunlink
|
|
|
|
- [ -z "$peeraddr" ] && {
|
|
- proto_notify_error "$cfg" "MISSING_ADDRESS"
|
|
- proto_block_restart "$cfg"
|
|
- exit
|
|
- }
|
|
-
|
|
( proto_add_host_dependency "$cfg" '' "$tunlink" )
|
|
|
|
[ -z "$ipaddr" ] && {
|
|
@@ -85,12 +79,6 @@ proto_vxlan6_setup() {
|
|
local ip6addr peer6addr
|
|
json_get_vars ip6addr peer6addr tunlink
|
|
|
|
- [ -z "$peer6addr" ] && {
|
|
- proto_notify_error "$cfg" "MISSING_ADDRESS"
|
|
- proto_block_restart "$cfg"
|
|
- exit
|
|
- }
|
|
-
|
|
( proto_add_host_dependency "$cfg" '' "$tunlink" )
|
|
|
|
[ -z "$ip6addr" ] && {
|