Skip to content

Commit ed6a604

Browse files
hzyitchzyitc
committed
Fix some issues when CONFIG_ALL_NONSHARED=y
1 parent be770a6 commit ed6a604

File tree

7 files changed

+164
-13
lines changed

7 files changed

+164
-13
lines changed

‎package/kernel/linux/modules/netfilter.mk‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ $(eval $(call KernelPackage,ipt-core))
9191
define KernelPackage/nf-conntrack
9292
SUBMENU:=$(NF_MENU)
9393
TITLE:=Netfilter connection tracking
94+
DEPENDS:= +kmod-pptp
9495
KCONFIG:= \
9596
CONFIG_NETFILTER=y \
9697
CONFIG_NETFILTER_ADVANCED=y \
@@ -259,7 +260,7 @@ define KernelPackage/ipt-ipopt
259260
KCONFIG:=$(KCONFIG_IPT_IPOPT)
260261
FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).ko)
261262
AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_IPOPT-m)))
262-
$(call AddDepends/ipt)
263+
$(call AddDepends/ipt,+kmod-nf-conntrack)
263264
endef
264265

265266
define KernelPackage/ipt-ipopt/description
@@ -859,7 +860,7 @@ define KernelPackage/br-netfilter
859860
TITLE:=Bridge netfilter support modules
860861
DEPENDS:=+kmod-ipt-core
861862
FILES:=$(LINUX_DIR)/net/bridge/br_netfilter.ko
862-
KCONFIG:=CONFIG_BRIDGE_NETFILTER
863+
KCONFIG:=CONFIG_BRIDGE_NETFILTER=y
863864
AUTOLOAD:=$(call AutoProbe,br_netfilter)
864865
endef
865866

‎package/kernel/mac80211/patches/all-ipq50xx/901-ath10k_thermal_config.patch‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
Copy from ../ath/080-ath10k_thermal_config.patch
2+
3+
--- a/drivers/net/wireless/ath/ath10k/Kconfig
4+
+++ b/drivers/net/wireless/ath/ath10k/Kconfig
5+
@@ -86,6 +86,12 @@ config ATH10K_TRACING
6+
help
7+
Select this to ath10k use tracing infrastructure.
8+
9+
+config ATH10K_THERMAL
10+
+ bool "Atheros ath10k thermal monitoring support"
11+
+ depends on THERMAL
12+
+ ---help---
13+
+ Select this to ath10k use hwmon for thermal measurement.
14+
+
15+
config ATH10K_DFS_CERTIFIED
16+
bool "Atheros DFS support for certified platforms"
17+
depends on ATH10K && CFG80211_CERTIFICATION_ONUS
18+
--- a/drivers/net/wireless/ath/ath10k/Makefile
19+
+++ b/drivers/net/wireless/ath/ath10k/Makefile
20+
@@ -18,7 +18,7 @@ ath10k_core-y += mac.o \
21+
ath10k_core-$(CPTCFG_ATH10K_SPECTRAL) += spectral.o
22+
ath10k_core-$(CPTCFG_NL80211_TESTMODE) += testmode.o
23+
ath10k_core-$(CPTCFG_ATH10K_TRACING) += trace.o
24+
-ath10k_core-$(CONFIG_THERMAL) += thermal.o
25+
+ath10k_core-$(CPTCFG_ATH10K_THERMAL) += thermal.o
26+
ath10k_core-$(CPTCFG_MAC80211_DEBUGFS) += debugfs_sta.o
27+
ath10k_core-$(CONFIG_PM) += wow.o
28+
ath10k_core-$(CONFIG_DEV_COREDUMP) += coredump.o
29+
--- a/drivers/net/wireless/ath/ath10k/thermal.h
30+
+++ b/drivers/net/wireless/ath/ath10k/thermal.h
31+
@@ -25,7 +25,7 @@ struct ath10k_thermal {
32+
int temperature;
33+
};
34+
35+
-#if IS_REACHABLE(CONFIG_THERMAL)
36+
+#if IS_REACHABLE(CPTCFG_ATH10K_THERMAL)
37+
int ath10k_thermal_register(struct ath10k *ar);
38+
void ath10k_thermal_unregister(struct ath10k *ar);
39+
void ath10k_thermal_event_temperature(struct ath10k *ar, int temperature);
40+
--- a/local-symbols
41+
+++ b/local-symbols
42+
@@ -142,6 +142,7 @@ ATH10K_SNOC=
43+
ATH10K_DEBUG=
44+
ATH10K_DEBUGFS=
45+
ATH10K_SPECTRAL=
46+
+ATH10K_THERMAL=
47+
ATH10K_TRACING=
48+
ATH10K_DFS_CERTIFIED=
49+
WCN36XX=

‎package/kernel/qca/qca-nss-clients/Makefile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -659,20 +659,20 @@ define Build/Compile
659659
endef
660660

661661
$(eval $(call KernelPackage,qca-nss-drv-profile))
662-
$(eval $(call KernelPackage,qca-nss-drv-capwapmgr))
662+
# $(eval $(call KernelPackage,qca-nss-drv-capwapmgr))
663663
$(eval $(call KernelPackage,qca-nss-drv-tun6rd))
664-
$(eval $(call KernelPackage,qca-nss-drv-dtlsmgr))
664+
# $(eval $(call KernelPackage,qca-nss-drv-dtlsmgr))
665665
$(eval $(call KernelPackage,qca-nss-drv-l2tpv2))
666666
$(eval $(call KernelPackage,qca-nss-drv-pptp))
667667
$(eval $(call KernelPackage,qca-nss-drv-pppoe))
668-
$(eval $(call KernelPackage,qca-nss-drv-map-t))
668+
# $(eval $(call KernelPackage,qca-nss-drv-map-t))
669669
$(eval $(call KernelPackage,qca-nss-drv-tunipip6))
670670
$(eval $(call KernelPackage,qca-nss-drv-qdisc))
671671
$(eval $(call KernelPackage,qca-nss-drv-igs))
672672
$(eval $(call KernelPackage,qca-nss-drv-netlink))
673-
$(eval $(call KernelPackage,qca-nss-drv-ipsecmgr))
674-
$(eval $(call KernelPackage,qca-nss-drv-ipsecmgr-klips))
675-
$(eval $(call KernelPackage,qca-nss-drv-ipsecmgr-xfrm))
673+
# $(eval $(call KernelPackage,qca-nss-drv-ipsecmgr))
674+
# $(eval $(call KernelPackage,qca-nss-drv-ipsecmgr-klips))
675+
# $(eval $(call KernelPackage,qca-nss-drv-ipsecmgr-xfrm))
676676
$(eval $(call KernelPackage,qca-nss-drv-bridge-mgr))
677677
$(eval $(call KernelPackage,qca-nss-drv-vlan-mgr))
678678
$(eval $(call KernelPackage,qca-nss-drv-lag-mgr))
@@ -684,7 +684,7 @@ $(eval $(call KernelPackage,qca-nss-drv-eogremgr))
684684
$(eval $(call KernelPackage,qca-nss-drv-clmapmgr))
685685
$(eval $(call KernelPackage,qca-nss-drv-vxlanmgr))
686686
$(eval $(call KernelPackage,qca-nss-drv-match))
687-
$(eval $(call KernelPackage,qca-nss-drv-tlsmgr))
687+
# $(eval $(call KernelPackage,qca-nss-drv-tlsmgr))
688688
$(eval $(call KernelPackage,qca-nss-drv-mirror))
689-
$(eval $(call KernelPackage,qca-nss-drv-mscs))
689+
# $(eval $(call KernelPackage,qca-nss-drv-mscs))
690690
$(eval $(call KernelPackage,qca-nss-drv-wifi-meshmgr))

‎package/kernel/qca/qca-nss-clients/patches/0001-Fix-compilation-issues.patch‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
From 0a84ca9107f12601410462af13bc61250678a5c7 Mon Sep 17 00:00:00 2001
2+
From: hzy <hzyitc@outlook.com>
3+
Date: Sun, 21 May 2023 13:04:59 +0000
4+
Subject: [PATCH] Fix compilation issues
5+
6+
Signed-off-by: hzy <hzyitc@outlook.com>
7+
---
8+
match/nss_match_priv.h | 6 +++---
9+
tunipip6/nss_connmgr_tunipip6.c | 2 +-
10+
vxlanmgr/nss_vxlanmgr.c | 2 +-
11+
3 files changed, 5 insertions(+), 5 deletions(-)
12+
13+
diff --git a/match/nss_match_priv.h b/match/nss_match_priv.h
14+
index 4386696..78ec37f 100644
15+
--- a/match/nss_match_priv.h
16+
+++ b/match/nss_match_priv.h
17+
@@ -29,19 +29,19 @@
18+
/*
19+
* Statically compile messages at different levels
20+
*/
21+
-#if (NSS_match_DEBUG_LEVEL < 2)
22+
+#if (NSS_MATCH_DEBUG_LEVEL < 2)
23+
#define nss_match_warn(s, ...)
24+
#else
25+
#define nss_match_warn(s, ...) pr_warn("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
26+
#endif
27+
28+
-#if (NSS_match_DEBUG_LEVEL < 3)
29+
+#if (NSS_MATCH_DEBUG_LEVEL < 3)
30+
#define nss_match_info(s, ...)
31+
#else
32+
#define nss_match_info(s, ...) pr_notice("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
33+
#endif
34+
35+
-#if (NSS_match_DEBUG_LEVEL < 4)
36+
+#if (NSS_MATCH_DEBUG_LEVEL < 4)
37+
#define nss_match_trace(s, ...)
38+
#else
39+
#define nss_match_trace(s, ...) pr_info("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
40+
diff --git a/tunipip6/nss_connmgr_tunipip6.c b/tunipip6/nss_connmgr_tunipip6.c
41+
index 0a03a7d..57f4e5a 100644
42+
--- a/tunipip6/nss_connmgr_tunipip6.c
43+
+++ b/tunipip6/nss_connmgr_tunipip6.c
44+
@@ -258,7 +258,7 @@ static void nss_tunipip6_decap_exception(struct net_device *dev, struct sk_buff
45+
struct iphdr *iph;
46+
struct rtable *rt;
47+
int cpu;
48+
- int8_t ver = skb->data[0] >> 4;
49+
+ int8_t __maybe_unused ver = skb->data[0] >> 4;
50+
51+
nss_tunipip6_trace("%px: received - %d bytes name %s ver %x\n",
52+
dev, skb->len, dev->name, ver);
53+
diff --git a/vxlanmgr/nss_vxlanmgr.c b/vxlanmgr/nss_vxlanmgr.c
54+
index b5805d8..5dd5573 100644
55+
--- a/vxlanmgr/nss_vxlanmgr.c
56+
+++ b/vxlanmgr/nss_vxlanmgr.c
57+
@@ -84,7 +84,7 @@ int32_t nss_vxlanmgr_bind_ipsec_by_ip(union vxlan_addr *src_ip, union vxlan_addr
58+
{
59+
int32_t ipsec_if_num;
60+
nss_vxlanmgr_get_ipsec_if_num_by_ip_callback_t ipsec_cb;
61+
- struct nss_ctx_instance *nss_ctx = nss_vxlan_get_ctx();
62+
+ struct nss_ctx_instance __maybe_unused *nss_ctx = nss_vxlan_get_ctx();
63+
64+
/*
65+
* Check if the VxLAN interface is applied over an IPsec interface by querying the IPsec.
66+
--
67+
2.25.1
68+

‎package/kernel/qca/qca-nss-ecm/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,9 @@ ECM_MAKE_OPTS+=ECM_NON_PORTED_SUPPORT_ENABLE=y
258258
# ECM_MAKE_OPTS+=ECM_FRONT_END_CONN_LIMIT_ENABLE=y
259259
# endif
260260

261-
ifneq ($(CONFIG_PACKAGE_kmod-nat46),)
262-
ECM_MAKE_OPTS+=ECM_INTERFACE_MAP_T_ENABLE=y
263-
endif
261+
# ifneq ($(CONFIG_PACKAGE_kmod-nat46),)
262+
# ECM_MAKE_OPTS+=ECM_INTERFACE_MAP_T_ENABLE=y
263+
# endif
264264

265265
ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-ovpn-link),)
266266
ECM_MAKE_OPTS+=ECM_INTERFACE_OVPN_ENABLE=y

‎target/linux/ipq50xx/config-5.4‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,11 +1249,15 @@ CONFIG_ZONE_DMA_FLAG=0
12491249
# CONFIG_DEBUG_MEM_USAGE is not set
12501250

12511251
# CONFIG_SKB_FIXED_SIZE_2K is not set
1252+
# CONFIG_DM_REQ_CRYPT is not set
12521253
# CONFIG_MHI_BUS_TEST is not set
12531254
# CONFIG_DIAG_MHI is not set
1255+
# CONFIG_DRM_MSM is not set
12541256
# CONFIG_BOOTCONFIG_PARTITION is not set
12551257
# CONFIG_QTI_BT_PIL is not set
12561258
# CONFIG_QTI_BT_INTERFACE is not set
1259+
# CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE is not set
1260+
# CONFIG_CORESIGHT_STREAM is not set
12571261

12581262
CONFIG_ARCH_IPQ256M=y
12591263
CONFIG_IPQ_MEM_PROFILE=256

‎target/linux/ipq50xx/patches/601-netfilter-br_netfilter-Don-t-invoke-iptables-by-defa.patch‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 8e93b67188de59d2b87f9f8dfa576d36de85fe2c Mon Sep 17 00:00:00 2001
2+
From: hzy <hzyitc@outlook.com>
3+
Date: Tue, 23 May 2023 21:24:04 +0000
4+
Subject: [PATCH] netfilter: br_netfilter: Don't invoke iptables by default
5+
6+
---
7+
net/bridge/br_netfilter_hooks.c | 6 +++---
8+
1 file changed, 3 insertions(+), 3 deletions(-)
9+
10+
diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c
11+
index fb360da..1286c96 100644
12+
--- a/net/bridge/br_netfilter_hooks.c
13+
+++ b/net/bridge/br_netfilter_hooks.c
14+
@@ -1105,9 +1105,9 @@ static struct ctl_table brnf_table[] = {
15+
16+
static inline void br_netfilter_sysctl_default(struct brnf_net *brnf)
17+
{
18+
- brnf->call_iptables = 1;
19+
- brnf->call_ip6tables = 1;
20+
- brnf->call_arptables = 1;
21+
+ brnf->call_iptables = 0;
22+
+ brnf->call_ip6tables = 0;
23+
+ brnf->call_arptables = 0;
24+
brnf->call_ebtables = 0;
25+
brnf->call_custom = 0;
26+
brnf->filter_vlan_tagged = 0;
27+
--
28+
2.25.1
29+

0 commit comments

Comments
 (0)