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, 10 insertions, 0 deletions

diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index b90fd86b2d18..ca5672f6ee2f 100644
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -118,6 +118,16 @@ int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
         wdev->wext.ibss.channel = params->channel;
 #endif
         wdev->sme_state = CFG80211_SME_CONNECTING;
+
+        err = cfg80211_can_use_chan(rdev, wdev, params->channel,
+                                    params->channel_fixed
+                                    ? CHAN_MODE_SHARED
+                                    : CHAN_MODE_EXCLUSIVE);
+        if (err) {
+                wdev->connect_keys = NULL;
+                return err;
+        }
+
         err = rdev->ops->join_ibss(&rdev->wiphy, dev, params);
         if (err) {
                 wdev->connect_keys = NULL;