From 273361355de6cc96b70636cbb16d75bd370bed20 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Fri, 16 Aug 2019 17:10:49 +0200 Subject: [PATCH] adopted from uptream: nl80211: allow multiple active --- Makefile | 2 +- os_dep/linux/ioctl_cfg80211.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 24a85ac..3cb036e 100755 --- a/Makefile +++ b/Makefile @@ -127,7 +127,7 @@ CONFIG_HIGH_ACTIVE_HST2DEV = n CONFIG_PNO_SUPPORT = n CONFIG_PNO_SET_DEBUG = n CONFIG_AP_WOWLAN = n -######### Notify SDIO Host Keep Power During Syspend ########## +######### Notify SDIO Host Keep Power During Suspend ########## CONFIG_RTW_SDIO_PM_KEEP_POWER = y ###################### MP HW TX MODE FOR VHT ####################### CONFIG_MP_VHT_HW_TX_MODE = y diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index 93993ba..c4bd61a 100755 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -9767,9 +9767,12 @@ struct ieee80211_supported_band *band; /* wiphy->flags |= WIPHY_FLAG_OFFCHAN_TX | WIPHY_FLAG_HAVE_AP_SME; */ #endif -#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) && \ - LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) +#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) + wiphy->max_sched_scan_reqs = 1; +#else wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; +#endif #ifdef CONFIG_PNO_SUPPORT wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT; #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)