ath9k_htc: Fix error handling in add_interface

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@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 4ced5cd6ef1c64471841086f87297410b29d5523..ebc5dbfb6a1b086c0943a8b0194b79832e30a7e3 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1140,7 +1140,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);
@@ -1168,18 +1169,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,