diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-12-08 13:58:58 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-12-08 13:58:58 -0500 |
| commit | 81c412600f946fc1c8731685cb6c6fae8002043a (patch) | |
| tree | 87bbdf52615ec4ee6003b69e74ea330ca1427e46 /drivers/net/wireless/ath/ath9k/main.c | |
| parent | fc99dd0829fd4d080b78141ade9a79bcc3dcd160 (diff) | |
| parent | 87141db0848aa20c43d453f5545efc8f390d4372 (diff) | |
| download | linux-81c412600f946fc1c8731685cb6c6fae8002043a.tar.gz linux-81c412600f946fc1c8731685cb6c6fae8002043a.tar.bz2 linux-81c412600f946fc1c8731685cb6c6fae8002043a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index cff070d7a325..9a72640237cb 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1000,9 +1000,8 @@ void ath9k_calculate_iter_data(struct ath_softc *sc, struct ath_vif *avp; /* - * Pick the MAC address of the first interface as the new hardware - * MAC address. The hardware will use it together with the BSSID mask - * when matching addresses. + * The hardware will use primary station addr together with the + * BSSID mask when matching addresses. */ memset(iter_data, 0, sizeof(*iter_data)); memset(&iter_data->mask, 0xff, ETH_ALEN); @@ -1232,6 +1231,8 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, list_add_tail(&avp->list, &avp->chanctx->vifs); } + ath9k_calculate_summary_state(sc, avp->chanctx); + ath9k_assign_hw_queues(hw, vif); an->sc = sc; @@ -1301,6 +1302,8 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw, ath_tx_node_cleanup(sc, &avp->mcast_node); + ath9k_calculate_summary_state(sc, avp->chanctx); + mutex_unlock(&sc->mutex); } |