From 892b521774f7d0783528b002f1cf974609f3b78b Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 29 Jun 2021 17:09:06 +0800 Subject: [PATCH] mac80211: grace code --- package/kernel/mac80211/Makefile | 6 +----- .../nss/199-002-ath11k_nss-add-nss-driver-interface.patch | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index 6f899777e..5aba3f7d9 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -436,7 +436,7 @@ config-$(CONFIG_LEDS_TRIGGERS) += MAC80211_LEDS MAKE_OPTS:= -C "$(PKG_BUILD_DIR)" \ $(KERNEL_MAKE_FLAGS) \ - EXTRA_CFLAGS="-I$(PKG_BUILD_DIR)/include $(IREMAP_CFLAGS)" \ + EXTRA_CFLAGS="-I$(PKG_BUILD_DIR)/include $(IREMAP_CFLAGS) -I$(STAGING_DIR)/usr/include/qca-nss-drv" \ KLIB_BUILD="$(LINUX_DIR)" \ MODPROBE=true \ KLIB=$(TARGET_MODULES_DIR) \ @@ -476,10 +476,6 @@ define Build/Prepare $(PKG_BUILD_DIR)/backport-include/linux/bcm47xx_nvram.h echo 'compat-wireless-$(PKG_VERSION)-$(PKG_RELEASE)-$(REVISION)' > $(PKG_BUILD_DIR)/compat_version - - mkdir -p $(STAGING_DIR)/usr/include/qca-nss-drv - echo 'compat-wireless-$(PKG_VERSION)-$(PKG_RELEASE)-$(REVISION)' > $(STAGING_DIR)/usr/include/qca-nss-drv/compat_version - $(CP) $(STAGING_DIR)/usr/include/qca-nss-drv/* $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath11k/ endef ifneq ($(CONFIG_PACKAGE_kmod-cfg80211)$(CONFIG_PACKAGE_kmod-lib80211),) diff --git a/package/kernel/mac80211/patches/nss/199-002-ath11k_nss-add-nss-driver-interface.patch b/package/kernel/mac80211/patches/nss/199-002-ath11k_nss-add-nss-driver-interface.patch index 341296465..67df0248e 100644 --- a/package/kernel/mac80211/patches/nss/199-002-ath11k_nss-add-nss-driver-interface.patch +++ b/package/kernel/mac80211/patches/nss/199-002-ath11k_nss-add-nss-driver-interface.patch @@ -2400,8 +2400,8 @@ Signed-off-by: Sriram R +#ifndef ATH11K_NSS_H +#define ATH11K_NSS_H + -+#include "nss_api_if.h" -+#include "nss_cmn.h" ++#include ++#include + +struct ath11k; +struct ath11k_base;