From: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Addition of a station might fail - handle this error
properly by removing the VAP on the target.
Also, bail out immediately if the max. no of interfaces
has been reached.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
---
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index c960330..b3b33ff 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1138,7 +1138,8 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw,
if (priv->nvifs >= ATH9K_HTC_MAX_VIF) {
ret = -ENOBUFS;
- goto out;
+ mutex_unlock(&priv->mutex);
+ return ret;
}
ath9k_htc_ps_wakeup(priv);
@@ -1166,18 +1167,19 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw,
if (ret)
goto out;
- priv->nvifs++;
-
/*
* We need a node in target to tx mgmt frames
* before association.
*/
ret = ath9k_htc_add_station(priv, vif, NULL);
- if (ret)
+ if (ret) {
+ WMI_CMD_BUF(WMI_VAP_REMOVE_CMDID, &hvif);
goto out;
+ }
priv->ah->opmode = vif->type;
priv->vif_slot |= (1 << avp->index);
+ priv->nvifs++;
priv->vif = vif;
ath_dbg(common, ATH_DBG_CONFIG,
--
1.7.3.5
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
