[PATCH 2/3] ath9k: get tx99_vif pointer in ath9k_tx99_init

[Lorenzo Bianconi <lorenzo.bianconi83@xxxxxxxxx>]

Get vif reference in ath9k_tx99_init() since mac80211 does not run
ath9k_add_interface() for monitor interfaces

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@xxxxxxxxx>
---
 drivers/net/wireless/ath/ath9k/main.c | 9 ---------
 drivers/net/wireless/ath/ath9k/tx99.c | 6 ++++++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 3d17398..7cb2ad9 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1046,14 +1046,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,
 
 	mutex_lock(&sc->mutex);
 
-	if (config_enabled(CONFIG_ATH9K_TX99)) {
-		if (sc->nvifs >= 1) {
-			mutex_unlock(&sc->mutex);
-			return -EOPNOTSUPP;
-		}
-		sc->tx99_vif = vif;
-	}
-
 	ath_dbg(common, CONFIG, "Attach a VIF of type: %d\n", vif->type);
 	sc->nvifs++;
 
@@ -1120,7 +1112,6 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,
 	mutex_lock(&sc->mutex);
 
 	sc->nvifs--;
-	sc->tx99_vif = NULL;
 
 	if (ath9k_uses_beacons(vif->type))
 		ath9k_beacon_remove_slot(sc, vif);
diff --git a/drivers/net/wireless/ath/ath9k/tx99.c b/drivers/net/wireless/ath/ath9k/tx99.c
index c65c37f..c90eca3 100644
--- a/drivers/net/wireless/ath/ath9k/tx99.c
+++ b/drivers/net/wireless/ath/ath9k/tx99.c
@@ -89,6 +89,8 @@ static void ath9k_tx99_deinit(struct ath_softc *sc)
 	ath9k_ps_wakeup(sc);
 	ath9k_tx99_stop(sc);
 	ath9k_ps_restore(sc);
+
+	sc->tx99_vif = NULL;
 }
 
 static int ath9k_tx99_init(struct ath_softc *sc)
@@ -105,6 +107,10 @@ static int ath9k_tx99_init(struct ath_softc *sc)
 		return -EINVAL;
 	}
 
+	sc->tx99_vif = ieee80211_get_vif_by_addr(hw, hw->wiphy->perm_addr);
+	if (!sc->tx99_vif)
+		return -EINVAL;
+
 	sc->tx99_skb = ath9k_build_tx99_skb(sc);
 	if (!sc->tx99_skb)
 		return -ENOMEM;
-- 
1.8.3.2

--
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