cfg80211/mac80211: move interface counting for combination check to mac80211

Move the counting part of the interface combination check from
cfg80211 to mac80211.

This is needed to simplify locking when the driver has to perform a
combination check by itself (eg. with channel-switch).

Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 46f404df35e3..9bfc4c621509 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1375,6 +1375,11 @@ int cfg80211_can_use_iftype_chan(struct cfg80211_registered_device *rdev,
 
         num[iftype] = 1;
 
+        /* TODO: We'll probably not need this anymore, since this
+         * should only be called with CHAN_MODE_UNDEFINED. There are
+         * still a couple of pending calls where other chanmodes are
+         * used, but we should get rid of them.
+         */
         switch (chanmode) {
         case CHAN_MODE_UNDEFINED:
                 break;