cfg80211: respect iface combinations when starting operation

devlist_mtx locking is changed to accomodate changes.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 5d29ed1f7c62..77102e66f1ea 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -2478,6 +2478,14 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                                           params.channel_type))
                 return -EINVAL;
 
+        mutex_lock(&rdev->devlist_mtx);
+        err = cfg80211_can_use_chan(rdev, wdev, params.channel,
+                                    CHAN_MODE_SHARED);
+        mutex_unlock(&rdev->devlist_mtx);
+
+        if (err)
+                return err;
+
         err = rdev->ops->start_ap(&rdev->wiphy, dev, &params);
         if (!err) {
                 wdev->preset_chan = params.channel;