him411/nss-packages-qosmio
1
0
Fork 0
mirror of https://github.com/qosmio/nss-packages.git synced 2025-12-16 16:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

nss-drv: Clean-up unecessary patches

Browse Source 
`0012-Makefile-modularize-driver.patch` mistakenly added 'wifi_mesh_init'
when it was already in 'nss_init.c'.

The patch following `0013-backport-12.4.patch` would then
clean up the "duplicated" entries.

Signed-off-by: Sean Khan <datapronix@protonmail.com>
This commit is contained in:
Sean Khan 2024-07-10 04:53:52 -04:00
parent 841d43b00f
commit 78364afce8
2 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qca-nss-drv/patches-11.4/0012-Makefile-modularize-driver.patch
View File

@ -163,14 +163,6 @@
ifeq ($(SoC),$(filter $(SoC),ipq807x ipq807x_64)) ifeq ($(SoC),$(filter $(SoC),ipq807x ipq807x_64))
qca-nss-drv-objs += nss_hal/ipq807x/nss_hal_pvt.o \ qca-nss-drv-objs += nss_hal/ipq807x/nss_hal_pvt.o \
nss_data_plane/hal/nss_ipq807x.o nss_data_plane/hal/nss_ipq807x.o
@@ -496,6 +545,7 @@ ccflags-y += -I$(obj)/nss_hal/ipq50xx -D
endif
ccflags-y += -I$(obj)/nss_hal/include -I$(obj)/nss_data_plane/include -I$(obj)/exports -DNSS_DEBUG_LEVEL=0 -DNSS_PKT_STATS_ENABLED=1
+
ccflags-y += -I$(obj)/nss_data_plane/hal/include
ccflags-y += -DNSS_PM_DEBUG_LEVEL=0 -DNSS_SKB_REUSE_SUPPORT=1
ccflags-y += -Wall -Werror
@@ -510,7 +560,14 @@ NSS_CCFLAGS = -DNSS_DT_SUPPORT=1 -DNSS_F @@ -510,7 +560,14 @@ NSS_CCFLAGS = -DNSS_DT_SUPPORT=1 -DNSS_F
ccflags-y += -I$(obj) ccflags-y += -I$(obj)
endif endif
@ -186,19 +178,3 @@
# Disable Frequency scaling # Disable Frequency scaling
ifeq "$(NSS_FREQ_SCALE_DISABLE)" "y" ifeq "$(NSS_FREQ_SCALE_DISABLE)" "y"
--- a/nss_init.c
+++ b/nss_init.c
@@ -880,6 +880,13 @@ static int __init nss_init(void)
#endif
/*
+ * Init Wi-Fi mesh
+ */
+#ifdef NSS_DRV_WIFI_MESH_ENABLE
+ nss_wifi_mesh_init();
+#endif
+
+ /*
* Register platform_driver
*/
return platform_driver_register(&nss_driver);

16
qca-nss-drv/patches-11.4/0013-backport-12.4.patch
View File

@ -1122,21 +1122,7 @@
/* /*
* Setup Runtime Sample values * Setup Runtime Sample values
@@ -880,13 +898,6 @@ static int __init nss_init(void) @@ -916,13 +934,17 @@ static void __exit nss_cleanup(void)
#endif
/*
- * Init Wi-Fi mesh
- */
-#ifdef NSS_DRV_WIFI_MESH_ENABLE
- nss_wifi_mesh_init();
-#endif
-
- /*
* Register platform_driver
*/
return platform_driver_register(&nss_driver);
@@ -923,13 +934,17 @@ static void __exit nss_cleanup(void)
/* /*
* Unregister pppoe specific sysctl * Unregister pppoe specific sysctl
*/ */