From bd6c225de465437939d3d6283a45e94fc13da53d Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Mon, 24 Sep 2018 01:14:25 +0800 Subject: [PATCH] add bridge support for IPSEC vpn --- package/lean/luci-app-ipsec-vpnd/Makefile | 4 ++-- target/linux/ar71xx/config-4.14 | 1 + target/linux/ar71xx/config-4.9 | 1 + target/linux/ar71xx/files/arch/mips/ath79/mach-fritz4020.c | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/lean/luci-app-ipsec-vpnd/Makefile b/package/lean/luci-app-ipsec-vpnd/Makefile index 0796b36c1..57fb5adbe 100644 --- a/package/lean/luci-app-ipsec-vpnd/Makefile +++ b/package/lean/luci-app-ipsec-vpnd/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for IPSec VPN Server (IKEv1 with PSK and Xauth) -LUCI_DEPENDS:=+strongswan-minimal +strongswan-mod-xauth-generic +LUCI_DEPENDS:=+strongswan-minimal +strongswan-mod-xauth-generic +kmod-br-netfilter LUCI_PKGARCH:=all PKG_VERSION:=2.0 -PKG_RELEASE:=8 +PKG_RELEASE:=9 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/target/linux/ar71xx/config-4.14 b/target/linux/ar71xx/config-4.14 index 535b5195c..61290b515 100644 --- a/target/linux/ar71xx/config-4.14 +++ b/target/linux/ar71xx/config-4.14 @@ -483,3 +483,4 @@ CONFIG_SYS_SUPPORTS_ZBOOT=y CONFIG_SYS_SUPPORTS_ZBOOT_UART_PROM=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_USB_SUPPORT=y +CONFIG_MIPS_FPU_EMULATOR=y diff --git a/target/linux/ar71xx/config-4.9 b/target/linux/ar71xx/config-4.9 index 8d25692ec..d0a1c2ce5 100644 --- a/target/linux/ar71xx/config-4.9 +++ b/target/linux/ar71xx/config-4.9 @@ -482,3 +482,4 @@ CONFIG_SYS_SUPPORTS_ZBOOT=y CONFIG_SYS_SUPPORTS_ZBOOT_UART_PROM=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_USB_SUPPORT=y +CONFIG_MIPS_FPU_EMULATOR=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-fritz4020.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-fritz4020.c index ed7f9a8b3..c00cf681b 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-fritz4020.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-fritz4020.c @@ -169,7 +169,7 @@ static struct gpio_keys_button fritz4020_gpio_keys[] __initdata = { .code = KEY_RFKILL, .debounce_interval = FRITZ4020_KEYS_DEBOUNCE_INTERVAL, .gpio = FRITZ4020_GPIO_BTN_WLAN, - .active_low = 0, + .active_low = 1, }, { .desc = "WPS button", @@ -177,7 +177,7 @@ static struct gpio_keys_button fritz4020_gpio_keys[] __initdata = { .code = KEY_WPS_BUTTON, .debounce_interval = FRITZ4020_KEYS_DEBOUNCE_INTERVAL, .gpio = FRITZ4020_GPIO_BTN_WPS, - .active_low = 0, + .active_low = 1, }, };