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>

diff --cc include/net/cfg80211.h
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/chan.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/util.c
Simple merge

diff --cc net/wireless/core.h
Simple merge

diff --cc net/wireless/ibss.c
Simple merge

diff --cc net/wireless/mesh.c
Simple merge

diff --cc net/wireless/mlme.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc net/wireless/util.c
Simple merge