From: David S. Miller <davem@davemloft.net>
Date: Sat, 30 Jun 2018 12:08:12 +0000 (+0900)
Subject: Merge tag 'mac80211-next-for-davem-2018-06-29' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v4.19-rc1~140^2~498
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/8365da2c0570f02615e7f1d2d729d854029202b0

Merge tag 'mac80211-next-for-davem-2018-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Small merge conflict in net/mac80211/scan.c, I preserved
the kcalloc() conversion. -DaveM

Johannes Berg says:

====================
This round's updates:
 * finally some of the promised HE code, but it turns
   out to be small - but everything kept changing, so
   one part I did in the driver was >30 patches for
   what was ultimately <200 lines of code ... similar
   here for this code.
 * improved scan privacy support - can now specify scan
   flags for randomizing the sequence number as well as
   reducing the probe request element content
 * rfkill cleanups
 * a timekeeping cleanup from Arnd
 * various other cleanups
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

8365da2c0570f02615e7f1d2d729d854029202b0
diff --cc net/mac80211/scan.c
index 2e917a6d239d,ae77d1c12856..5d2a11777718
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@@ -1157,7 -1197,10 +1197,10 @@@ int __ieee80211_request_sched_scan_star
  		}
  	}
  
+ 	if (req->flags & NL80211_SCAN_FLAG_MIN_PREQ_CONTENT)
+ 		flags |= IEEE80211_PROBE_FLAG_MIN_CONTENT;
+ 
 -	ie = kzalloc(num_bands * iebufsz, GFP_KERNEL);
 +	ie = kcalloc(iebufsz, num_bands, GFP_KERNEL);
  	if (!ie) {
  		ret = -ENOMEM;
  		goto out;