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>

1 files changed, 20 insertions, 1 deletions

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 48e8097339ab..a88551f3bc43 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2006-2010          Johannes Berg <johannes@sipsolutions.net>
  * Copyright 2013-2014  Intel Mobile Communications GmbH
- * Copyright 2015       Intel Deutschland GmbH
+ * Copyright 2015-2017  Intel Deutschland GmbH
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -744,6 +744,8 @@ int wiphy_register(struct wiphy *wiphy)
 
         /* sanity check supported bands/channels */
         for (band = 0; band < NUM_NL80211_BANDS; band++) {
+                u16 types = 0;
+
                 sband = wiphy->bands[band];
                 if (!sband)
                         continue;
@@ -788,6 +790,23 @@ int wiphy_register(struct wiphy *wiphy)
                         sband->channels[i].band = band;
                 }
 
+                for (i = 0; i < sband->n_iftype_data; i++) {
+                        const struct ieee80211_sband_iftype_data *iftd;
+
+                        iftd = &sband->iftype_data[i];
+
+                        if (WARN_ON(!iftd->types_mask))
+                                return -EINVAL;
+                        if (WARN_ON(types & iftd->types_mask))
+                                return -EINVAL;
+
+                        /* at least one piece of information must be present */
+                        if (WARN_ON(!iftd->he_cap.has_he))
+                                return -EINVAL;
+
+                        types |= iftd->types_mask;
+                }
+
                 have_band = true;
         }