diff options
| author | David S. Miller <davem@davemloft.net> | 2019-10-13 20:29:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-13 20:29:07 +0200 |
| commit | 7e0d15ee0d8ba28a41ed02c8d2c1c17124b13234 (patch) | |
| tree | 05dd5ee69af1a16110e999be6e6b0482bbe68124 /net/wireless | |
| parent | genetlink: do not parse attributes for families with zero maxattr (diff) | |
| parent | mac80211_hwsim: add support for OCB (diff) | |
| download | linux-7e0d15ee0d8ba28a41ed02c8d2c1c17124b13234.tar.xz linux-7e0d15ee0d8ba28a41ed02c8d2c1c17124b13234.zip | |
Merge tag 'mac80211-next-for-net-next-2019-10-11' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
A few more small things, nothing really stands out:
* minstrel improvements from Felix
* a TX aggregation simplification
* some additional capabilities for hwsim
* minor cleanups & docs updates
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 141cdb171665..7a7b63550eb6 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -8265,10 +8265,8 @@ static int nl80211_start_sched_scan(struct sk_buff *skb, /* leave request id zero for legacy request * or if driver does not support multi-scheduled scan */ - if (want_multi && rdev->wiphy.max_sched_scan_reqs > 1) { - while (!sched_scan_req->reqid) - sched_scan_req->reqid = cfg80211_assign_cookie(rdev); - } + if (want_multi && rdev->wiphy.max_sched_scan_reqs > 1) + sched_scan_req->reqid = cfg80211_assign_cookie(rdev); err = rdev_sched_scan_start(rdev, dev, sched_scan_req); if (err) |