Skip to content

Commit 09e143a

Browse files
hzyitchzyitc
committed
Fix some issues when CONFIG_ALL_NONSHARED=y
1 parent 81999e1 commit 09e143a

File tree

3 files changed

+109
-29
lines changed

3 files changed

+109
-29
lines changed

‎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: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -658,33 +658,33 @@ define Build/Compile
658658
modules
659659
endef
660660

661-
$(eval $(call KernelPackage,qca-nss-drv-profile))
662-
$(eval $(call KernelPackage,qca-nss-drv-capwapmgr))
663-
$(eval $(call KernelPackage,qca-nss-drv-tun6rd))
664-
$(eval $(call KernelPackage,qca-nss-drv-dtlsmgr))
665-
$(eval $(call KernelPackage,qca-nss-drv-l2tpv2))
666-
$(eval $(call KernelPackage,qca-nss-drv-pptp))
667-
$(eval $(call KernelPackage,qca-nss-drv-pppoe))
668-
$(eval $(call KernelPackage,qca-nss-drv-map-t))
669-
$(eval $(call KernelPackage,qca-nss-drv-tunipip6))
670-
$(eval $(call KernelPackage,qca-nss-drv-qdisc))
671-
$(eval $(call KernelPackage,qca-nss-drv-igs))
672-
$(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))
676-
$(eval $(call KernelPackage,qca-nss-drv-bridge-mgr))
677-
$(eval $(call KernelPackage,qca-nss-drv-vlan-mgr))
678-
$(eval $(call KernelPackage,qca-nss-drv-lag-mgr))
679-
$(eval $(call KernelPackage,qca-nss-drv-gre))
680-
$(eval $(call KernelPackage,qca-nss-drv-ovpn-mgr))
681-
$(eval $(call KernelPackage,qca-nss-drv-ovpn-link))
682-
$(eval $(call KernelPackage,qca-nss-drv-pvxlanmgr))
683-
$(eval $(call KernelPackage,qca-nss-drv-eogremgr))
684-
$(eval $(call KernelPackage,qca-nss-drv-clmapmgr))
685-
$(eval $(call KernelPackage,qca-nss-drv-vxlanmgr))
686-
$(eval $(call KernelPackage,qca-nss-drv-match))
687-
$(eval $(call KernelPackage,qca-nss-drv-tlsmgr))
688-
$(eval $(call KernelPackage,qca-nss-drv-mirror))
689-
$(eval $(call KernelPackage,qca-nss-drv-mscs))
661+
# $(eval $(call KernelPackage,qca-nss-drv-profile))
662+
# $(eval $(call KernelPackage,qca-nss-drv-capwapmgr))
663+
# $(eval $(call KernelPackage,qca-nss-drv-tun6rd))
664+
# $(eval $(call KernelPackage,qca-nss-drv-dtlsmgr))
665+
# $(eval $(call KernelPackage,qca-nss-drv-l2tpv2))
666+
# $(eval $(call KernelPackage,qca-nss-drv-pptp))
667+
# $(eval $(call KernelPackage,qca-nss-drv-pppoe))
668+
# $(eval $(call KernelPackage,qca-nss-drv-map-t))
669+
# $(eval $(call KernelPackage,qca-nss-drv-tunipip6))
670+
# $(eval $(call KernelPackage,qca-nss-drv-qdisc))
671+
# $(eval $(call KernelPackage,qca-nss-drv-igs))
672+
# $(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))
676+
# $(eval $(call KernelPackage,qca-nss-drv-bridge-mgr))
677+
# $(eval $(call KernelPackage,qca-nss-drv-vlan-mgr))
678+
# $(eval $(call KernelPackage,qca-nss-drv-lag-mgr))
679+
# $(eval $(call KernelPackage,qca-nss-drv-gre))
680+
# $(eval $(call KernelPackage,qca-nss-drv-ovpn-mgr))
681+
# $(eval $(call KernelPackage,qca-nss-drv-ovpn-link))
682+
# $(eval $(call KernelPackage,qca-nss-drv-pvxlanmgr))
683+
# $(eval $(call KernelPackage,qca-nss-drv-eogremgr))
684+
# $(eval $(call KernelPackage,qca-nss-drv-clmapmgr))
685+
# $(eval $(call KernelPackage,qca-nss-drv-vxlanmgr))
686+
# $(eval $(call KernelPackage,qca-nss-drv-match))
687+
# $(eval $(call KernelPackage,qca-nss-drv-tlsmgr))
688+
# $(eval $(call KernelPackage,qca-nss-drv-mirror))
689+
# $(eval $(call KernelPackage,qca-nss-drv-mscs))
690690
$(eval $(call KernelPackage,qca-nss-drv-wifi-meshmgr))

‎package/kernel/qca/qca-nss-drv/patches/0011-Fix-compilation-issues.patch‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
From cefe13878b386f09c43b770f3d43a27dc6a27362 Mon Sep 17 00:00:00 2001
2+
From: hzy <hzyitc@outlook.com>
3+
Date: Mon, 22 May 2023 21:17:38 +0000
4+
Subject: [PATCH] Fix compilation issues
5+
6+
Signed-off-by: hzy <hzyitc@outlook.com>
7+
---
8+
nss_core.c | 7 -------
9+
1 file changed, 7 deletions(-)
10+
11+
diff --git a/nss_core.c b/nss_core.c
12+
index d8dee77..e903e6e 100644
13+
--- a/nss_core.c
14+
+++ b/nss_core.c
15+
@@ -1103,13 +1103,6 @@ static inline void nss_core_rx_pbuf(struct nss_ctx_instance *nss_ctx, struct n2h
16+
*/
17+
static inline void nss_core_set_skb_classify(struct sk_buff *nbuf)
18+
{
19+
-#ifdef CONFIG_NET_CLS_ACT
20+
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0))
21+
- nbuf->tc_verd = SET_TC_NCLS_NSS(nbuf->tc_verd);
22+
-#else
23+
- skb_set_tc_classify_offload(nbuf);
24+
-#endif
25+
-#endif
26+
}
27+
28+
/*
29+
--
30+
2.25.1
31+

0 commit comments

Comments
 (0)