From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756038AbdEEV6c (ORCPT ); Fri, 5 May 2017 17:58:32 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:53364 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751323AbdEEV62 (ORCPT ); Fri, 5 May 2017 17:58:28 -0400 Date: Fri, 5 May 2017 14:58:19 -0700 From: Greg KH To: Linus Torvalds , Andrew Morton , Stephen Rothwell Cc: linux-kernel@vger.kernel.org, devel@linuxdriverproject.org Subject: [PATCH 2/3] staging: rtl8723bs: merge fix for "nl80211: allow multiple active scheduled scan requests" Message-ID: <20170505215819.GC19258@kroah.com> References: <20170505215630.GA19258@kroah.com> <20170505215736.GB19258@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170505215736.GB19258@kroah.com> User-Agent: Mutt/1.8.2 (2017-04-18) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Rothwell Fix up the rtl8723bs driver for the nl80211 api change that came in from the wifi tree. Signed-off-by: Stephen Rothwell Signed-off-by: Greg Kroah-Hartman --- 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 e4fdda3c4591..f092a72bffda 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 -- 2.12.2