diff --git a/qca/nss-userspace-oss/libnl-nss/Makefile b/qca/nss-userspace-oss/libnl-nss/Makefile index 185ea0f..528c86a 100644 --- a/qca/nss-userspace-oss/libnl-nss/Makefile +++ b/qca/nss-userspace-oss/libnl-nss/Makefile @@ -11,7 +11,7 @@ define Package/libnl-nss SECTION:=Libs CATEGORY:=Libraries TITLE:=Framework to communicate between userspace applications and the kernel. - DEPENDS:=+libpthread +libnl +@NSS_DRV_CRYPTO_ENABLE +kmod-qca-nss-drv-netlink + DEPENDS:=+libpthread +libnl +@NSS_DRV_CRYPTO_ENABLE endef define Package/libnl-nss/description diff --git a/qca/qca-nss-clients/Makefile b/qca/qca-nss-clients/Makefile index d7be8d7..56fd012 100644 --- a/qca/qca-nss-clients/Makefile +++ b/qca/qca-nss-clients/Makefile @@ -89,7 +89,7 @@ define KernelPackage/qca-nss-drv-dtlsmgr TITLE:=Kernel driver for NSS (connection manager) - dtlsmgr DEPENDS:=+@NSS_DRV_DTLS_ENABLE \ +kmod-qca-nss-drv \ - +PACKAGE_kmod-qca-nss-cfi-cryptoapi:kmod-qca-nss-cfi-cryptoapi + +kmod-qca-nss-cfi-cryptoapi FILES:=$(PKG_BUILD_DIR)/dtls/$(DTLSMGR_DIR)/qca-nss-dtlsmgr.ko endef @@ -226,7 +226,7 @@ define KernelPackage/qca-nss-drv-ipsecmgr CATEGORY:=Kernel modules SUBMENU:=Network Devices TITLE:=Kernel driver for NSS (ipsec manager) - ipsecmgr - DEPENDS:=@!TARGET_ipq95xx +kmod-qca-nss-drv +kmod-qca-nss-cfi-cryptoapi \ + DEPENDS:=@!TARGET_ipq95xx +@NSS_DRV_IPSEC_ENABLE +kmod-qca-nss-drv +kmod-qca-nss-cfi-cryptoapi \ +PACKAGE_kmod-qca-nss-drv-l2tpv2:kmod-qca-nss-drv-l2tpv2 FILES:=$(PKG_BUILD_DIR)/ipsecmgr/$(IPSECMGR_DIR)/qca-nss-ipsecmgr.ko AUTOLOAD:=$(call AutoLoad,60,qca-nss-ipsecmgr) @@ -382,9 +382,12 @@ define KernelPackage/qca-nss-drv-netlink DEPENDS:=+@NSS_DRV_C2C_ENABLE +@NSS_DRV_GRE_ENABLE +@NSS_DRV_GRE_REDIR_ENABLE \ +@NSS_DRV_IPV4_REASM_ENABLE +@NSS_DRV_IPV6_ENABLE +@NSS_DRV_IPV6_REASM_ENABLE \ +@NSS_DRV_RMNET_ENABLE +@NSS_DRV_OAM_ENABLE +@NSS_DRV_QRFS_ENABLE +@NSS_DRV_L2TP_ENABLE +@NSS_DRV_MAPT_ENABLE \ - +@NSS_DRV_CAPWAP_ENABLE +@NSS_DRV_LSO_RX_ENABLE \ - +kmod-pppoe +kmod-qca-nss-drv-dtlsmgr \ - +PACKAGE_kmod-qca-nss-drv-ipsecmgr:kmod-qca-nss-drv-ipsecmgr \ + +@NSS_DRV_CAPWAP_ENABLE +@NSS_DRV_LSO_RX_ENABLE +@NSS_DRV_UDP_ST_ENABLE +@NSS_DRV_PPTP_ENABLE +@NSS_DRV_WIFI_LEGACY_ENABLE \ + +@NSS_DRV_PPPOE_ENABLE \ + +kmod-ppp \ + +kmod-pppoe \ + +kmod-qca-nss-drv-dtlsmgr \ + +kmod-qca-nss-drv-ipsecmgr \ +kmod-qca-nss-drv TITLE:=NSS NETLINK Manager for QCA NSS driver FILES:=$(PKG_BUILD_DIR)/netlink/qca-nss-netlink.ko @@ -401,7 +404,7 @@ define KernelPackage/qca-nss-drv-ovpn-mgr TITLE:=Kernel driver for NSS OpenVPN manager DEPENDS:=@(TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_64||TARGET_ipq807x||TARGET_qualcommax||TARGET_ipq_ipq60xx||TARGET_ipq_ipq60xx_64||TARGET_ipq60xx) \ +@NSS_DRV_QVPN_ENABLE +kmod-qca-nss-drv +kmod-tun +kmod-ipt-conntrack \ - +PACKAGE_kmod-qca-nss-cfi-cryptoapi:kmod-qca-nss-cfi-cryptoapi + +kmod-qca-nss-cfi-cryptoapi FILES:=$(PKG_BUILD_DIR)/openvpn/src/qca-nss-ovpn-mgr.ko endef diff --git a/qca/qca-nss-drv/Config.in b/qca/qca-nss-drv/Config.in index 43651cb..6044a55 100644 --- a/qca/qca-nss-drv/Config.in +++ b/qca/qca-nss-drv/Config.in @@ -94,7 +94,7 @@ config NSS_DRV_PORTID_ENABLE bool default n prompt "Enable PORTID" -config CONFIG_NSS_DRV_LSO_RX_ENABLE +config NSS_DRV_LSO_RX_ENABLE bool default n prompt "Enable LSO RX" @@ -142,6 +142,10 @@ config NSS_DRV_TRUSTSEC_ENABLE bool default n prompt "Enable TRUSTSEC" +config NSS_DRV_UDP_ST_ENABLE + bool + default n + prompt "Enable UDP Speedtest" config NSS_DRV_TRUSTSEC_RX_ENABLE bool default n @@ -185,4 +189,8 @@ config NSS_DRV_WIFI_MESH_ENABLE default n depends on NSS_DRV_WIFI_ENABLE prompt "Enable WIFI MESH" +config NSS_DRV_WIFI_LEGACY_ENABLE + bool + default n + prompt "Enable Legacy WIFI" endmenu diff --git a/qca/qca-nss-drv/Makefile b/qca/qca-nss-drv/Makefile index 73d83c0..b3ed393 100644 --- a/qca/qca-nss-drv/Makefile +++ b/qca/qca-nss-drv/Makefile @@ -46,6 +46,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_NSS_DRV_RMNET_ENABLE \ CONFIG_NSS_DRV_SHAPER_ENABLE \ CONFIG_NSS_DRV_SJACK_ENABLE \ + CONFIG_NSS_DRV_UDP_ST_ENABLE \ CONFIG_NSS_DRV_TLS_ENABLE \ CONFIG_NSS_DRV_TRUSTSEC_ENABLE \ CONFIG_NSS_DRV_TRUSTSEC_RX_ENABLE \ @@ -57,7 +58,8 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_NSS_DRV_VXLAN_ENABLE \ CONFIG_NSS_DRV_WIFI_ENABLE \ CONFIG_NSS_DRV_WIFI_EXT_VDEV_ENABLE \ - CONFIG_NSS_DRV_WIFI_MESH_ENABLE + CONFIG_NSS_DRV_WIFI_MESH_ENABLE \ + CONFIG_NSS_DRV_WIFI_LEGACY_ENABLE include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/package.mk @@ -271,7 +273,7 @@ endif ifndef CONFIG_NSS_DRV_WIFI_MESH_ENABLE DRV_MAKE_OPTS += NSS_DRV_WIFI_MESH_ENABLE=n endif -ifndef NSS_DRV_UDP_ST_ENABLE +ifndef CONFIG_NSS_DRV_UDP_ST_ENABLE DRV_MAKE_OPTS += NSS_DRV_UDP_ST_ENABLE=n endif ifndef CONFIG_NSS_DRV_CAPWAP_ENABLE @@ -280,6 +282,9 @@ endif ifndef CONFIG_NSS_DRV_LSO_RX_ENABLE DRV_MAKE_OPTS += NSS_DRV_LSO_RX_ENABLE=n endif +ifndef CONFIG_NSS_DRV_WIFI_LEGACY_ENABLE + DRV_MAKE_OPTS += NSS_DRV_WIFI_LEGACY_ENABLE=n +endif define Build/Configure $(LN) arch/nss_$(SOC).h $(PKG_BUILD_DIR)/exports/nss_arch.h endef diff --git a/qca/qca-nss-drv/patches/0013-nss-drv-remove-legacy-wifi.patch b/qca/qca-nss-drv/patches/0013-nss-drv-remove-legacy-wifi.patch index e9f795b..58149a8 100644 --- a/qca/qca-nss-drv/patches/0013-nss-drv-remove-legacy-wifi.patch +++ b/qca/qca-nss-drv/patches/0013-nss-drv-remove-legacy-wifi.patch @@ -1,17 +1,24 @@ --- a/Makefile +++ b/Makefile -@@ -352,10 +352,14 @@ endif +@@ -350,12 +350,19 @@ qca-nss-drv-objs += \ + nss_pppoe_strings.o + endif - ifneq "$(NSS_DRV_WIFIOFFLOAD_ENABLE)" "n" - ccflags-y += -DNSS_DRV_WIFIOFFLOAD_ENABLE -+ifeq ($(SoC),$(filter $(SoC),ipq806x)) +-ifneq "$(NSS_DRV_WIFIOFFLOAD_ENABLE)" "n" +-ccflags-y += -DNSS_DRV_WIFIOFFLOAD_ENABLE ++ifneq "$(NSS_DRV_WIFI_ENABLE)" "n" ++ccflags-y += -DNSS_DRV_WIFI_ENABLE ++ifneq "$(NSS_DRV_WIFI_LEGACY_ENABLE)" "n" ++ccflags-y += -DNSS_DRV_WIFI_LEGACY_ENABLE qca-nss-drv-objs += \ nss_wifi.o \ nss_wifi_log.o \ - nss_wifi_stats.o \ + nss_wifi_stats.o ++ifeq ($(SoC),$(filter $(SoC),ipq806x)) +ccflags-y += -DNSS_HAL_IPQ806x_SUPPORT +endif ++endif +qca-nss-drv-objs += \ nss_wifi_vdev.o \ nss_wifili.o \