Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-microblaze.git] / drivers / net / wireless / broadcom / brcm80211 / brcmfmac / cfg80211.c

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 78d9966..cf267f9 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -414,23 +414,24 @@ static int brcmf_vif_change_validate(struct brcmf_cfg80211_info *cfg,
                                     struct brcmf_cfg80211_vif *vif,
                                     enum nl80211_iftype new_type)
 {
-       int iftype_num[NUM_NL80211_IFTYPES];
        struct brcmf_cfg80211_vif *pos;
        bool check_combos = false;
        int ret = 0;
+       struct iface_combination_params params = {
+               .num_different_channels = 1,
+       };
 
-       memset(&iftype_num[0], 0, sizeof(iftype_num));
        list_for_each_entry(pos, &cfg->vif_list, list)
                if (pos == vif) {
-                       iftype_num[new_type]++;
+                       params.iftype_num[new_type]++;
                } else {
                        /* concurrent interfaces so need check combinations */
                        check_combos = true;
-                       iftype_num[pos->wdev.iftype]++;
+                       params.iftype_num[pos->wdev.iftype]++;
                }
 
        if (check_combos)
-               ret = cfg80211_check_combinations(cfg->wiphy, 1, 0, iftype_num);
+               ret = cfg80211_check_combinations(cfg->wiphy, &params);
 
        return ret;
 }
@@ -438,15 +439,16 @@ static int brcmf_vif_change_validate(struct brcmf_cfg80211_info *cfg,
 static int brcmf_vif_add_validate(struct brcmf_cfg80211_info *cfg,
                                  enum nl80211_iftype new_type)
 {
-       int iftype_num[NUM_NL80211_IFTYPES];
        struct brcmf_cfg80211_vif *pos;
+       struct iface_combination_params params = {
+               .num_different_channels = 1,
+       };
 
-       memset(&iftype_num[0], 0, sizeof(iftype_num));
        list_for_each_entry(pos, &cfg->vif_list, list)
-               iftype_num[pos->wdev.iftype]++;
+               params.iftype_num[pos->wdev.iftype]++;
 
-       iftype_num[new_type]++;
-       return cfg80211_check_combinations(cfg->wiphy, 1, 0, iftype_num);
+       params.iftype_num[new_type]++;
+       return cfg80211_check_combinations(cfg->wiphy, &params);
 }
 
 static void convert_key_from_CPU(struct brcmf_wsec_key *key,