Skip to content

Commit 8fc47dc

Browse files
committed
Fix some issues when CONFIG_ALL_NONSHARED=y
1 parent 70cb106 commit 8fc47dc

File tree

2 files changed

+60
-29
lines changed

2 files changed

+60
-29
lines changed

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))
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)