From: Greg KH <gregkh@linuxfoundation.org>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
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"
Date: Fri, 5 May 2017 14:58:19 -0700 [thread overview]
Message-ID: <20170505215819.GC19258@kroah.com> (raw)
In-Reply-To: <20170505215736.GB19258@kroah.com>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Fix up the rtl8723bs driver for the nl80211 api change that came in from
the wifi tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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
next prev parent reply other threads:[~2017-05-05 21:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-05 21:56 [GIT PULL] Staging/IIO driver fixes for 4.12-rc1 Greg KH
2017-05-05 21:57 ` [PATCH 1/3] staging: rtl8723bs: merge fix for add/change_virtual-intf API change Greg KH
2017-05-05 21:58 ` Greg KH [this message]
2017-05-05 21:59 ` [PATCH 3/3] staging: rtl8723bs: fix up for cfg80211_roamed() " Greg KH
2017-05-06 20:33 ` kbuild test robot
2017-05-06 20:28 ` [PATCH 2/3] staging: rtl8723bs: merge fix for "nl80211: allow multiple active scheduled scan requests" kbuild test robot
2017-05-06 8:00 ` [GIT PULL] Staging/IIO driver fixes for 4.12-rc1 Ian W MORRISON
2017-05-06 13:41 ` Greg KH
2017-05-06 14:21 ` Ian W MORRISON
2017-05-06 14:46 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170505215819.GC19258@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=devel@linuxdriverproject.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.