brcmfmac: no interface combination check for single interface

The interface combinations are intended for use-case in which the driver
handles multiple interface concurrently. This means that the combinations
do not need to be checked when there is only a single interface active.

Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Arend van Spriel 2015-12-10 13:43:06 +01:00 committed by Kalle Valo
parent fdf3456422
commit 353c46ac9e

View File

@ -396,15 +396,23 @@ static int brcmf_vif_change_validate(struct brcmf_cfg80211_info *cfg,
{
int iftype_num[NUM_NL80211_IFTYPES];
struct brcmf_cfg80211_vif *pos;
bool check_combos = false;
int ret = 0;
memset(&iftype_num[0], 0, sizeof(iftype_num));
list_for_each_entry(pos, &cfg->vif_list, list)
if (pos == vif)
if (pos == vif) {
iftype_num[new_type]++;
else
} else {
/* concurrent interfaces so need check combinations */
check_combos = true;
iftype_num[pos->wdev.iftype]++;
}
return cfg80211_check_combinations(cfg->wiphy, 1, 0, iftype_num);
if (check_combos)
ret = cfg80211_check_combinations(cfg->wiphy, 1, 0, iftype_num);
return ret;
}
static int brcmf_vif_add_validate(struct brcmf_cfg80211_info *cfg,