gl-infra-builder-FUjr/patches-wlan-ap/openwrt/0003-kernel-fix-build-fail-for-bridge.patch
Jianhui Zhao 81568e7d86 fix .gitignore for push patches-wlan-ap
Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>
2022-01-22 10:06:05 +08:00

40 lines
1.8 KiB
Diff

From eae5b6ea255f5819e0423de012622b13ef2a1639 Mon Sep 17 00:00:00 2001
From: Jianhui Zhao <jianhui.zhao@gl-inet.com>
Date: Fri, 21 Jan 2022 18:14:44 +0800
Subject: [PATCH 3/4] kernel: fix build fail for bridge
Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>
---
include/netfilter.mk | 1 +
package/kernel/linux/modules/netfilter.mk | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/netfilter.mk b/include/netfilter.mk
index cee40ee008..9a3cdbbba8 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -185,6 +185,7 @@ $(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_RT, $(P_V6)ip6t_rt))
$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat),))
$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_REDIRECT, $(P_XT)nf_nat_redirect, lt 4.18),))
$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_IPV4, $(P_V4)nf_nat_ipv4, lt 4.18),))
+$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT6,CONFIG_NF_NAT_IPV6, $(P_V6)nf_nat_ipv6, lt 4.18),))
$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_MASQUERADE_IPV4, $(P_V4)nf_nat_masquerade_ipv4, lt 4.18),))
$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NETFILTER_XT_NAT, $(P_XT)xt_nat),))
diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index 1be05e182a..8ad91784f3 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -859,7 +859,7 @@ define KernelPackage/br-netfilter
TITLE:=Bridge netfilter support modules
DEPENDS:=+kmod-ipt-core
FILES:=$(LINUX_DIR)/net/bridge/br_netfilter.ko
- KCONFIG:=CONFIG_BRIDGE_NETFILTER
+ KCONFIG:=CONFIG_BRIDGE_NETFILTER=y
AUTOLOAD:=$(call AutoProbe,br_netfilter)
endef
--
2.25.1