nss-packages-breeze303/qca/qca-nss-clients/patches/0022-netlink-modularize-makefile.patch
Qosmio 07bfcd93d6 nss: fix warnings and dependencies
* nssinfo:
  - Fix warnings related string formatting
* qca-nss-ecm:
  - Remove unnecessary dependency on `CONFIG_NSS_DRV_WIFIOFFLOAD_ENABLE`
* qca-nss-clients(netlink):
  - Fix regression in enabling wifil. It was rename to 'CONFIG_NSS_DRV_WIFIOFFLOAD_ENABLE'
    in qca-nss-drv vs 'CONFIG_NSS_DRV_WIFI_ENABLE'
  - Modularize Makefile to only build nludp_st on platform ipq95xx/ipq50xx
* qca-nss-clients(qdisc/igs):
  - fix build igs
* qca-nss-drv:
  - Remove options to configure `CONFIG_NSS_DRV_DMA_ENABLE` and `CONFIG_NSS_DRV_EDMA_ENABLE`.
    These are always built and required on ipq807x, ipq60xx
2024-02-17 17:04:37 -05:00

45 lines
1.3 KiB
Diff

--- a/netlink/Makefile
+++ b/netlink/Makefile
@@ -27,7 +27,6 @@ ccflags-y += -DCONFIG_NSS_NLPPTP=1
ccflags-y += -DCONFIG_NSS_NLCAPWAP=${CAPWAP_ENABLED}
ccflags-y += -DCONFIG_NSS_NLIPSEC=${IPSEC_ENABLED}
ccflags-y += -DCONFIG_NSS_NLDTLS=${DTLS_ENABLED}
-ccflags-y += -DCONFIG_NSS_NLUDP_ST=1
qca-nss-netlink-objs := nss_nl.o
qca-nss-netlink-objs += nss_nlgre_redir_family.o
@@ -49,7 +48,6 @@ qca-nss-netlink-objs += nss_nlmap_t.o
qca-nss-netlink-objs += nss_nlpppoe.o
qca-nss-netlink-objs += nss_nll2tpv2.o
qca-nss-netlink-objs += nss_nlpptp.o
-qca-nss-netlink-objs += nss_nludp_st.o
qca-nss-netlink-objs += nss_nlqrfs.o
ifneq (,$(filter $(capwapmgr), y))
@@ -81,4 +79,11 @@ else
ccflags-y += -DCONFIG_NSS_NLEDMA=0
endif
+ifeq ($(SoC),$(filter $(SoC),ipq95xx ipq50xx))
+ccflags-y += -DCONFIG_NSS_NLUDP_ST=1
+qca-nss-netlink-objs += nss_nludp_st.o
+else
+ccflags-y += -DCONFIG_NSS_NLUDP_ST=0
+endif
+
obj-m += qca-nss-netlink.o
--- a/netlink/nss_nludp_st.h
+++ b/netlink/nss_nludp_st.h
@@ -23,10 +23,9 @@
#ifndef __NSS_NLUDP_ST_H
#define __NSS_NLUDP_ST_H
+#if defined(CONFIG_NSS_NLUDP_ST) && CONFIG_NSS_NLUDP_ST > 0
bool nss_nludp_st_init(void);
bool nss_nludp_st_exit(void);
-
-#if defined(CONFIG_NSS_NLUDP_ST)
#define NSS_NLUDP_ST_INIT nss_nludp_st_init
#define NSS_NLUDP_ST_EXIT nss_nludp_st_exit
#else