On Thu, Apr 27, 2017 at 02:20:21PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c: In function 'rtw_cfg80211_preinit_wiphy':
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3409:18: error: 'WIPHY_FLAG_SUPPORTS_SCHED_SCAN' undeclared (first use in this function)
> wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
> ^
>
> Caused by commit
>
> 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
>
> interacting with commit
>
> ca986ad9bcd3 ("nl80211: allow multiple active scheduled scan requests")
>
> from the mac80211-next tree.
>
> I applied the below merge fix patch.
>
> Also, I noticed that CONFIG_PNO_SUPPORT is checked for in several
> files, but there is no such Kconfig option ...
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Thu, 27 Apr 2017 14:12:12 +1000
> Subject: [PATCH] staging: merge fix for "nl80211: allow multiple active
> scheduled scan requests"
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> index f17f4fbd3396..c1977b11b6ac 100644
> --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> @@ -3406,7 +3406,7 @@ static void rtw_cfg80211_preinit_wiphy(struct adapter *padapter, struct wiphy *w
> wiphy->flags |= WIPHY_FLAG_OFFCHAN_TX | WIPHY_FLAG_HAVE_AP_SME;
>
> #if defined(CONFIG_PM)
> - wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
> + wiphy->max_sched_scan_reqs = 1;
> #ifdef CONFIG_PNO_SUPPORT
> wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT;
> #endif
Thanks for the patch, looks good to me.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
