--- /dev/null
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -34,27 +34,6 @@ static inline bool ath9k_check_auto_slee
+ (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_AUTOSLEEP);
+ }
+
+-static struct ieee80211_hw * ath_get_virt_hw(struct ath_softc *sc,
+- struct ieee80211_hdr *hdr)
+-{
+- struct ieee80211_hw *hw = sc->pri_wiphy->hw;
+- int i;
+-
+- spin_lock_bh(&sc->wiphy_lock);
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- struct ath_wiphy *aphy = sc->sec_wiphy[i];
+- if (aphy == NULL)
+- continue;
+- if (compare_ether_addr(hdr->addr1, aphy->hw->wiphy->perm_addr)
+- == 0) {
+- hw = aphy->hw;
+- break;
+- }
+- }
+- spin_unlock_bh(&sc->wiphy_lock);
+- return hw;
+-}
+-
+ /*
+ * Setup and link descriptors.
+ *
+@@ -463,8 +442,7 @@ u32 ath_calcrxfilter(struct ath_softc *s
+ if (conf_is_ht(&sc->hw->conf))
+ rfilt |= ATH9K_RX_FILTER_COMP_BAR;
+
+- if (sc->sec_wiphy || (sc->nvifs > 1) ||
+- (sc->rx.rxfilter & FIF_OTHER_BSS)) {
++ if (sc->nvifs > 1 || (sc->rx.rxfilter & FIF_OTHER_BSS)) {
+ /* The following may also be needed for other older chips */
+ if (sc->sc_ah->hw_version.macVersion == AR_SREV_VERSION_9160)
+ rfilt |= ATH9K_RX_FILTER_PROM;
+@@ -668,37 +646,6 @@ static void ath_rx_ps(struct ath_softc *
+ }
+ }
+
+-static void ath_rx_send_to_mac80211(struct ieee80211_hw *hw,
+- struct ath_softc *sc, struct sk_buff *skb)
+-{
+- struct ieee80211_hdr *hdr;
+-
+- hdr = (struct ieee80211_hdr *)skb->data;
+-
+- /* Send the frame to mac80211 */
+- if (is_multicast_ether_addr(hdr->addr1)) {
+- int i;
+- /*
+- * Deliver broadcast/multicast frames to all suitable
+- * virtual wiphys.
+- */
+- /* TODO: filter based on channel configuration */
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- struct ath_wiphy *aphy = sc->sec_wiphy[i];
+- struct sk_buff *nskb;
+- if (aphy == NULL)
+- continue;
+- nskb = skb_copy(skb, GFP_ATOMIC);
+- if (!nskb)
+- continue;
+- ieee80211_rx(aphy->hw, nskb);
+- }
+- ieee80211_rx(sc->hw, skb);
+- } else
+- /* Deliver unicast frames based on receiver address */
+- ieee80211_rx(hw, skb);
+-}
+-
+ static bool ath_edma_get_buffers(struct ath_softc *sc,
+ enum ath9k_rx_qtype qtype)
+ {
+@@ -1644,7 +1591,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
+ * virtual wiphy so to account for that we iterate over the active
+ * wiphys and find the appropriate wiphy and therefore hw.
+ */
+- struct ieee80211_hw *hw = NULL;
++ struct ieee80211_hw *hw = sc->hw;
+ struct ieee80211_hdr *hdr;
+ int retval;
+ bool decrypt_error = false;
+@@ -1689,8 +1636,6 @@ int ath_rx_tasklet(struct ath_softc *sc,
+ hdr = (struct ieee80211_hdr *) (skb->data + rx_status_len);
+ rxs = IEEE80211_SKB_RXCB(skb);
+
+- hw = ath_get_virt_hw(sc, hdr);
+-
+ ath_debug_stat_rx(sc, &rs);
+
+ /*
+@@ -1748,7 +1693,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
+ bf->bf_mpdu = NULL;
+ bf->bf_buf_addr = 0;
+ ath_err(common, "dma_mapping_error() on RX\n");
+- ath_rx_send_to_mac80211(hw, sc, skb);
++ ieee80211_rx(hw, skb);
+ break;
+ }
+
+@@ -1775,7 +1720,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
+ if (ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB)
+ ath_ant_comb_scan(sc, &rs);
+
+- ath_rx_send_to_mac80211(hw, sc, skb);
++ ieee80211_rx(hw, skb);
+
+ requeue:
+ if (edma) {
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -1076,29 +1076,7 @@ static int ath9k_start(struct ieee80211_
+
+ mutex_lock(&sc->mutex);
+
+- if (ath9k_wiphy_started(sc)) {
+- if (sc->chan_idx == curchan->hw_value) {
+- /*
+- * Already on the operational channel, the new wiphy
+- * can be marked active.
+- */
+- aphy->state = ATH_WIPHY_ACTIVE;
+- ieee80211_wake_queues(hw);
+- } else {
+- /*
+- * Another wiphy is on another channel, start the new
+- * wiphy in paused state.
+- */
+- aphy->state = ATH_WIPHY_PAUSED;
+- ieee80211_stop_queues(hw);
+- }
+- mutex_unlock(&sc->mutex);
+- return 0;
+- }
+- aphy->state = ATH_WIPHY_ACTIVE;
+-
+ /* setup initial channel */
+-
+ sc->chan_idx = curchan->hw_value;
+
+ init_channel = ath_get_curchannel(sc, hw);
+@@ -1208,13 +1186,6 @@ static int ath9k_tx(struct ieee80211_hw
+ struct ath_tx_control txctl;
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+
+- if (aphy->state != ATH_WIPHY_ACTIVE && aphy->state != ATH_WIPHY_SCAN) {
+- ath_dbg(common, ATH_DBG_XMIT,
+- "ath9k: %s: TX in unexpected wiphy state %d\n",
+- wiphy_name(hw->wiphy), aphy->state);
+- goto exit;
+- }
+-
+ if (sc->ps_enabled) {
+ /*
+ * mac80211 does not set PM field for normal data frames, so we
+@@ -1277,37 +1248,19 @@ static void ath9k_stop(struct ieee80211_
+ struct ath_softc *sc = aphy->sc;
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
+- int i;
+
+ mutex_lock(&sc->mutex);
+
+- aphy->state = ATH_WIPHY_INACTIVE;
+-
+ cancel_delayed_work_sync(&sc->tx_complete_work);
+ cancel_work_sync(&sc->paprd_work);
+ cancel_work_sync(&sc->hw_check_work);
+
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- if (sc->sec_wiphy[i])
+- break;
+- }
+-
+- if (i == sc->num_sec_wiphy) {
+- cancel_delayed_work_sync(&sc->wiphy_work);
+- cancel_work_sync(&sc->chan_work);
+- }
+-
+ if (sc->sc_flags & SC_OP_INVALID) {
+ ath_dbg(common, ATH_DBG_ANY, "Device not present\n");
+ mutex_unlock(&sc->mutex);
+ return;
+ }
+
+- if (ath9k_wiphy_started(sc)) {
+- mutex_unlock(&sc->mutex);
+- return; /* another wiphy still in use */
+- }
+-
+ /* Ensure HW is awake when we try to shut it down. */
+ ath9k_ps_wakeup(sc);
+
+@@ -1339,7 +1292,6 @@ static void ath9k_stop(struct ieee80211_
+ ath9k_ps_restore(sc);
+
+ sc->ps_idle = true;
+- ath9k_set_wiphy_idle(aphy, true);
+ ath_radio_disable(sc, hw);
+
+ sc->sc_flags |= SC_OP_INVALID;
+@@ -1429,7 +1381,6 @@ void ath9k_calculate_iter_data(struct ie
+ struct ath_softc *sc = aphy->sc;
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
+- int i;
+
+ /*
+ * Use the hardware MAC address as reference, the hardware uses it
+@@ -1443,16 +1394,8 @@ void ath9k_calculate_iter_data(struct ie
+ ath9k_vif_iter(iter_data, vif->addr, vif);
+
+ /* Get list of all active MAC addresses */
+- spin_lock_bh(&sc->wiphy_lock);
+ ieee80211_iterate_active_interfaces_atomic(sc->hw, ath9k_vif_iter,
+ iter_data);
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- if (sc->sec_wiphy[i] == NULL)
+- continue;
+- ieee80211_iterate_active_interfaces_atomic(
+- sc->sec_wiphy[i]->hw, ath9k_vif_iter, iter_data);
+- }
+- spin_unlock_bh(&sc->wiphy_lock);
+ }
+
+ /* Called with sc->mutex held. */
+@@ -1706,7 +1649,7 @@ static int ath9k_config(struct ieee80211
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
+ struct ieee80211_conf *conf = &hw->conf;
+- bool disable_radio;
++ bool disable_radio = false;
+
+ mutex_lock(&sc->mutex);
+
+@@ -1717,29 +1660,13 @@ static int ath9k_config(struct ieee80211
+ * the end.
+ */
+ if (changed & IEEE80211_CONF_CHANGE_IDLE) {
+- bool enable_radio;
+- bool all_wiphys_idle;
+- bool idle = !!(conf->flags & IEEE80211_CONF_IDLE);
+-
+- spin_lock_bh(&sc->wiphy_lock);
+- all_wiphys_idle = ath9k_all_wiphys_idle(sc);
+- ath9k_set_wiphy_idle(aphy, idle);
+-
+- enable_radio = (!idle && all_wiphys_idle);
+-
+- /*
+- * After we unlock here its possible another wiphy
+- * can be re-renabled so to account for that we will
+- * only disable the radio toward the end of this routine
+- * if by then all wiphys are still idle.
+- */
+- spin_unlock_bh(&sc->wiphy_lock);
+-
+- if (enable_radio) {
+- sc->ps_idle = false;
++ sc->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE);
++ if (!sc->ps_idle) {
+ ath_radio_enable(sc, hw);
+ ath_dbg(common, ATH_DBG_CONFIG,
+ "not-idle: enabling radio\n");
++ } else {
++ disable_radio = true;
+ }
+ }
+
+@@ -1780,24 +1707,11 @@ static int ath9k_config(struct ieee80211
+ if (ah->curchan)
+ old_pos = ah->curchan - &ah->channels[0];
+
+- aphy->chan_idx = pos;
+- aphy->chan_is_ht = conf_is_ht(conf);
+ if (hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
+ sc->sc_flags |= SC_OP_OFFCHANNEL;
+ else
+ sc->sc_flags &= ~SC_OP_OFFCHANNEL;
+
+- if (aphy->state == ATH_WIPHY_SCAN ||
+- aphy->state == ATH_WIPHY_ACTIVE)
+- ath9k_wiphy_pause_all_forced(sc, aphy);
+- else {
+- /*
+- * Do not change operational channel based on a paused
+- * wiphy changes.
+- */
+- goto skip_chan_change;
+- }
+-
+ ath_dbg(common, ATH_DBG_CONFIG, "Set channel: %d MHz\n",
+ curchan->center_freq);
+
+@@ -1844,19 +1758,13 @@ static int ath9k_config(struct ieee80211
+ ath_update_survey_nf(sc, old_pos);
+ }
+
+-skip_chan_change:
+ if (changed & IEEE80211_CONF_CHANGE_POWER) {
+ sc->config.txpowlimit = 2 * conf->power_level;
+ ath_update_txpow(sc);
+ }
+
+- spin_lock_bh(&sc->wiphy_lock);
+- disable_radio = ath9k_all_wiphys_idle(sc);
+- spin_unlock_bh(&sc->wiphy_lock);
+-
+ if (disable_radio) {
+ ath_dbg(common, ATH_DBG_CONFIG, "idle: disabling radio\n");
+- sc->ps_idle = true;
+ ath_radio_disable(sc, hw);
+ }
+
+@@ -2247,43 +2155,6 @@ static int ath9k_get_survey(struct ieee8
+ return 0;
+ }
+
+-static void ath9k_sw_scan_start(struct ieee80211_hw *hw)
+-{
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
+-
+- mutex_lock(&sc->mutex);
+- if (ath9k_wiphy_scanning(sc)) {
+- /*
+- * There is a race here in mac80211 but fixing it requires
+- * we revisit how we handle the scan complete callback.
+- * After mac80211 fixes we will not have configured hardware
+- * to the home channel nor would we have configured the RX
+- * filter yet.
+- */
+- mutex_unlock(&sc->mutex);
+- return;
+- }
+-
+- aphy->state = ATH_WIPHY_SCAN;
+- ath9k_wiphy_pause_all_forced(sc, aphy);
+- mutex_unlock(&sc->mutex);
+-}
+-
+-/*
+- * XXX: this requires a revisit after the driver
+- * scan_complete gets moved to another place/removed in mac80211.
+- */
+-static void ath9k_sw_scan_complete(struct ieee80211_hw *hw)
+-{
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
+-
+- mutex_lock(&sc->mutex);
+- aphy->state = ATH_WIPHY_ACTIVE;
+- mutex_unlock(&sc->mutex);
+-}
+-
+ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
+ {
+ struct ath_wiphy *aphy = hw->priv;
+@@ -2315,8 +2186,6 @@ struct ieee80211_ops ath9k_ops = {
+ .reset_tsf = ath9k_reset_tsf,
+ .ampdu_action = ath9k_ampdu_action,
+ .get_survey = ath9k_get_survey,
+- .sw_scan_start = ath9k_sw_scan_start,
+- .sw_scan_complete = ath9k_sw_scan_complete,
+ .rfkill_poll = ath9k_rfkill_poll_state,
+ .set_coverage_class = ath9k_set_coverage_class,
+ };
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -381,7 +381,6 @@ struct ath_beacon {
+ u32 ast_be_xmit;
+ u64 bc_tstamp;
+ struct ieee80211_vif *bslot[ATH_BCBUF];
+- struct ath_wiphy *bslot_aphy[ATH_BCBUF];
+ int slottime;
+ int slotupdate;
+ struct ath9k_tx_queue_info beacon_qi;
+@@ -572,20 +571,8 @@ struct ath_softc {
+ struct ieee80211_hw *hw;
+ struct device *dev;
+
+- spinlock_t wiphy_lock; /* spinlock to protect ath_wiphy data */
+- struct ath_wiphy *pri_wiphy;
+- struct ath_wiphy **sec_wiphy; /* secondary wiphys (virtual radios); may
+- * have NULL entries */
+- int num_sec_wiphy; /* number of sec_wiphy pointers in the array */
+ int chan_idx;
+ int chan_is_ht;
+- struct ath_wiphy *next_wiphy;
+- struct work_struct chan_work;
+- int wiphy_select_failures;
+- unsigned long wiphy_select_first_fail;
+- struct delayed_work wiphy_work;
+- unsigned long wiphy_scheduler_int;
+- int wiphy_scheduler_index;
+ struct survey_info *cur_survey;
+ struct survey_info survey[ATH9K_NUM_CHANNELS];
+
+@@ -645,16 +632,6 @@ struct ath_wiphy {
+ struct ath_softc *sc; /* shared for all virtual wiphys */
+ struct ieee80211_hw *hw;
+ struct ath9k_hw_cal_data caldata;
+- enum ath_wiphy_state {
+- ATH_WIPHY_INACTIVE,
+- ATH_WIPHY_ACTIVE,
+- ATH_WIPHY_PAUSING,
+- ATH_WIPHY_PAUSED,
+- ATH_WIPHY_SCAN,
+- } state;
+- bool idle;
+- int chan_idx;
+- int chan_is_ht;
+ int last_rssi;
+ };
+
+@@ -711,24 +688,6 @@ void ath9k_ps_restore(struct ath_softc *
+ u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate);
+
+ void ath9k_set_bssid_mask(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
+-int ath9k_wiphy_add(struct ath_softc *sc);
+-int ath9k_wiphy_del(struct ath_wiphy *aphy);
+-void ath9k_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, int ftype);
+-int ath9k_wiphy_pause(struct ath_wiphy *aphy);
+-int ath9k_wiphy_unpause(struct ath_wiphy *aphy);
+-int ath9k_wiphy_select(struct ath_wiphy *aphy);
+-void ath9k_wiphy_set_scheduler(struct ath_softc *sc, unsigned int msec_int);
+-void ath9k_wiphy_chan_work(struct work_struct *work);
+-bool ath9k_wiphy_started(struct ath_softc *sc);
+-void ath9k_wiphy_pause_all_forced(struct ath_softc *sc,
+- struct ath_wiphy *selected);
+-bool ath9k_wiphy_scanning(struct ath_softc *sc);
+-void ath9k_wiphy_work(struct work_struct *work);
+-bool ath9k_all_wiphys_idle(struct ath_softc *sc);
+-void ath9k_set_wiphy_idle(struct ath_wiphy *aphy, bool idle);
+-
+-void ath_mac80211_stop_queue(struct ath_softc *sc, u16 skb_queue);
+-bool ath_mac80211_start_queue(struct ath_softc *sc, u16 skb_queue);
+
+ void ath_start_rfkill_poll(struct ath_softc *sc);
+ extern void ath9k_rfkill_poll_state(struct ieee80211_hw *hw);
+--- a/drivers/net/wireless/ath/ath9k/virtual.c
++++ /dev/null
+@@ -1,669 +0,0 @@
+-/*
+- * Copyright (c) 2008-2009 Atheros Communications Inc.
+- *
+- * Permission to use, copy, modify, and/or distribute this software for any
+- * purpose with or without fee is hereby granted, provided that the above
+- * copyright notice and this permission notice appear in all copies.
+- *
+- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+- */
+-
+-#include <linux/slab.h>
+-
+-#include "ath9k.h"
+-
+-int ath9k_wiphy_add(struct ath_softc *sc)
+-{
+- int i, error;
+- struct ath_wiphy *aphy;
+- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+- struct ieee80211_hw *hw;
+- u8 addr[ETH_ALEN];
+-
+- hw = ieee80211_alloc_hw(sizeof(struct ath_wiphy), &ath9k_ops);
+- if (hw == NULL)
+- return -ENOMEM;
+-
+- spin_lock_bh(&sc->wiphy_lock);
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- if (sc->sec_wiphy[i] == NULL)
+- break;
+- }
+-
+- if (i == sc->num_sec_wiphy) {
+- /* No empty slot available; increase array length */
+- struct ath_wiphy **n;
+- n = krealloc(sc->sec_wiphy,
+- (sc->num_sec_wiphy + 1) *
+- sizeof(struct ath_wiphy *),
+- GFP_ATOMIC);
+- if (n == NULL) {
+- spin_unlock_bh(&sc->wiphy_lock);
+- ieee80211_free_hw(hw);
+- return -ENOMEM;
+- }
+- n[i] = NULL;
+- sc->sec_wiphy = n;
+- sc->num_sec_wiphy++;
+- }
+-
+- SET_IEEE80211_DEV(hw, sc->dev);
+-
+- aphy = hw->priv;
+- aphy->sc = sc;
+- aphy->hw = hw;
+- sc->sec_wiphy[i] = aphy;
+- aphy->last_rssi = ATH_RSSI_DUMMY_MARKER;
+- spin_unlock_bh(&sc->wiphy_lock);
+-
+- memcpy(addr, common->macaddr, ETH_ALEN);
+- addr[0] |= 0x02; /* Locally managed address */
+- /*
+- * XOR virtual wiphy index into the least significant bits to generate
+- * a different MAC address for each virtual wiphy.
+- */
+- addr[5] ^= i & 0xff;
+- addr[4] ^= (i & 0xff00) >> 8;
+- addr[3] ^= (i & 0xff0000) >> 16;
+-
+- SET_IEEE80211_PERM_ADDR(hw, addr);
+-
+- ath9k_set_hw_capab(sc, hw);
+-
+- error = ieee80211_register_hw(hw);
+-
+- if (error == 0) {
+- /* Make sure wiphy scheduler is started (if enabled) */
+- ath9k_wiphy_set_scheduler(sc, sc->wiphy_scheduler_int);
+- }
+-
+- return error;
+-}
+-
+-int ath9k_wiphy_del(struct ath_wiphy *aphy)
+-{
+- struct ath_softc *sc = aphy->sc;
+- int i;
+-
+- spin_lock_bh(&sc->wiphy_lock);
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- if (aphy == sc->sec_wiphy[i]) {
+- sc->sec_wiphy[i] = NULL;
+- spin_unlock_bh(&sc->wiphy_lock);
+- ieee80211_unregister_hw(aphy->hw);
+- ieee80211_free_hw(aphy->hw);
+- return 0;
+- }
+- }
+- spin_unlock_bh(&sc->wiphy_lock);
+- return -ENOENT;
+-}
+-
+-static int ath9k_send_nullfunc(struct ath_wiphy *aphy,
+- struct ieee80211_vif *vif, const u8 *bssid,
+- int ps)
+-{
+- struct ath_softc *sc = aphy->sc;
+- struct ath_tx_control txctl;
+- struct sk_buff *skb;
+- struct ieee80211_hdr *hdr;
+- __le16 fc;
+- struct ieee80211_tx_info *info;
+-
+- skb = dev_alloc_skb(24);
+- if (skb == NULL)
+- return -ENOMEM;
+- hdr = (struct ieee80211_hdr *) skb_put(skb, 24);
+- memset(hdr, 0, 24);
+- fc = cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC |
+- IEEE80211_FCTL_TODS);
+- if (ps)
+- fc |= cpu_to_le16(IEEE80211_FCTL_PM);
+- hdr->frame_control = fc;
+- memcpy(hdr->addr1, bssid, ETH_ALEN);
+- memcpy(hdr->addr2, aphy->hw->wiphy->perm_addr, ETH_ALEN);
+- memcpy(hdr->addr3, bssid, ETH_ALEN);
+-
+- info = IEEE80211_SKB_CB(skb);
+- memset(info, 0, sizeof(*info));
+- info->flags = IEEE80211_TX_CTL_REQ_TX_STATUS;
+- info->control.vif = vif;
+- info->control.rates[0].idx = 0;
+- info->control.rates[0].count = 4;
+- info->control.rates[1].idx = -1;
+-
+- memset(&txctl, 0, sizeof(struct ath_tx_control));
+- txctl.txq = sc->tx.txq_map[WME_AC_VO];
+- txctl.frame_type = ps ? ATH9K_IFT_PAUSE : ATH9K_IFT_UNPAUSE;
+-
+- if (ath_tx_start(aphy->hw, skb, &txctl) != 0)
+- goto exit;
+-
+- return 0;
+-exit:
+- dev_kfree_skb_any(skb);
+- return -1;
+-}
+-
+-static bool __ath9k_wiphy_pausing(struct ath_softc *sc)
+-{
+- int i;
+- if (sc->pri_wiphy->state == ATH_WIPHY_PAUSING)
+- return true;
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- if (sc->sec_wiphy[i] &&
+- sc->sec_wiphy[i]->state == ATH_WIPHY_PAUSING)
+- return true;
+- }
+- return false;
+-}
+-
+-static bool ath9k_wiphy_pausing(struct ath_softc *sc)
+-{
+- bool ret;
+- spin_lock_bh(&sc->wiphy_lock);
+- ret = __ath9k_wiphy_pausing(sc);
+- spin_unlock_bh(&sc->wiphy_lock);
+- return ret;
+-}
+-
+-static bool __ath9k_wiphy_scanning(struct ath_softc *sc)
+-{
+- int i;
+- if (sc->pri_wiphy->state == ATH_WIPHY_SCAN)
+- return true;
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- if (sc->sec_wiphy[i] &&
+- sc->sec_wiphy[i]->state == ATH_WIPHY_SCAN)
+- return true;
+- }
+- return false;
+-}
+-
+-bool ath9k_wiphy_scanning(struct ath_softc *sc)
+-{
+- bool ret;
+- spin_lock_bh(&sc->wiphy_lock);
+- ret = __ath9k_wiphy_scanning(sc);
+- spin_unlock_bh(&sc->wiphy_lock);
+- return ret;
+-}
+-
+-static int __ath9k_wiphy_unpause(struct ath_wiphy *aphy);
+-
+-/* caller must hold wiphy_lock */
+-static void __ath9k_wiphy_unpause_ch(struct ath_wiphy *aphy)
+-{
+- if (aphy == NULL)
+- return;
+- if (aphy->chan_idx != aphy->sc->chan_idx)
+- return; /* wiphy not on the selected channel */
+- __ath9k_wiphy_unpause(aphy);
+-}
+-
+-static void ath9k_wiphy_unpause_channel(struct ath_softc *sc)
+-{
+- int i;
+- spin_lock_bh(&sc->wiphy_lock);
+- __ath9k_wiphy_unpause_ch(sc->pri_wiphy);
+- for (i = 0; i < sc->num_sec_wiphy; i++)
+- __ath9k_wiphy_unpause_ch(sc->sec_wiphy[i]);
+- spin_unlock_bh(&sc->wiphy_lock);
+-}
+-
+-void ath9k_wiphy_chan_work(struct work_struct *work)
+-{
+- struct ath_softc *sc = container_of(work, struct ath_softc, chan_work);
+- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+- struct ath_wiphy *aphy = sc->next_wiphy;
+-
+- if (aphy == NULL)
+- return;
+-
+- /*
+- * All pending interfaces paused; ready to change
+- * channels.
+- */
+-
+- /* Change channels */
+- mutex_lock(&sc->mutex);
+- /* XXX: remove me eventually */
+- ath9k_update_ichannel(sc, aphy->hw,
+- &sc->sc_ah->channels[sc->chan_idx]);
+-
+- /* sync hw configuration for hw code */
+- common->hw = aphy->hw;
+-
+- if (ath_set_channel(sc, aphy->hw,
+- &sc->sc_ah->channels[sc->chan_idx]) < 0) {
+- printk(KERN_DEBUG "ath9k: Failed to set channel for new "
+- "virtual wiphy\n");
+- mutex_unlock(&sc->mutex);
+- return;
+- }
+- mutex_unlock(&sc->mutex);
+-
+- ath9k_wiphy_unpause_channel(sc);
+-}
+-
+-/*
+- * ath9k version of ieee80211_tx_status() for TX frames that are generated
+- * internally in the driver.
+- */
+-void ath9k_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, int ftype)
+-{
+- struct ath_wiphy *aphy = hw->priv;
+- struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+-
+- if (ftype == ATH9K_IFT_PAUSE && aphy->state == ATH_WIPHY_PAUSING) {
+- if (!(tx_info->flags & IEEE80211_TX_STAT_ACK)) {
+- printk(KERN_DEBUG "ath9k: %s: no ACK for pause "
+- "frame\n", wiphy_name(hw->wiphy));
+- /*
+- * The AP did not reply; ignore this to allow us to
+- * continue.
+- */
+- }
+- aphy->state = ATH_WIPHY_PAUSED;
+- if (!ath9k_wiphy_pausing(aphy->sc)) {
+- /*
+- * Drop from tasklet to work to allow mutex for channel
+- * change.
+- */
+- ieee80211_queue_work(aphy->sc->hw,
+- &aphy->sc->chan_work);
+- }
+- }
+-
+- dev_kfree_skb(skb);
+-}
+-
+-static void ath9k_mark_paused(struct ath_wiphy *aphy)
+-{
+- struct ath_softc *sc = aphy->sc;
+- aphy->state = ATH_WIPHY_PAUSED;
+- if (!__ath9k_wiphy_pausing(sc))
+- ieee80211_queue_work(sc->hw, &sc->chan_work);
+-}
+-
+-static void ath9k_pause_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
+-{
+- struct ath_wiphy *aphy = data;
+- struct ath_vif *avp = (void *) vif->drv_priv;
+-
+- switch (vif->type) {
+- case NL80211_IFTYPE_STATION:
+- if (!vif->bss_conf.assoc) {
+- ath9k_mark_paused(aphy);
+- break;
+- }
+- /* TODO: could avoid this if already in PS mode */
+- if (ath9k_send_nullfunc(aphy, vif, avp->bssid, 1)) {
+- printk(KERN_DEBUG "%s: failed to send PS nullfunc\n",
+- __func__);
+- ath9k_mark_paused(aphy);
+- }
+- break;
+- case NL80211_IFTYPE_AP:
+- /* Beacon transmission is paused by aphy->state change */
+- ath9k_mark_paused(aphy);
+- break;
+- default:
+- break;
+- }
+-}
+-
+-/* caller must hold wiphy_lock */
+-static int __ath9k_wiphy_pause(struct ath_wiphy *aphy)
+-{
+- ieee80211_stop_queues(aphy->hw);
+- aphy->state = ATH_WIPHY_PAUSING;
+- /*
+- * TODO: handle PAUSING->PAUSED for the case where there are multiple
+- * active vifs (now we do it on the first vif getting ready; should be
+- * on the last)
+- */
+- ieee80211_iterate_active_interfaces_atomic(aphy->hw, ath9k_pause_iter,
+- aphy);
+- return 0;
+-}
+-
+-int ath9k_wiphy_pause(struct ath_wiphy *aphy)
+-{
+- int ret;
+- spin_lock_bh(&aphy->sc->wiphy_lock);
+- ret = __ath9k_wiphy_pause(aphy);
+- spin_unlock_bh(&aphy->sc->wiphy_lock);
+- return ret;
+-}
+-
+-static void ath9k_unpause_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
+-{
+- struct ath_wiphy *aphy = data;
+- struct ath_vif *avp = (void *) vif->drv_priv;
+-
+- switch (vif->type) {
+- case NL80211_IFTYPE_STATION:
+- if (!vif->bss_conf.assoc)
+- break;
+- ath9k_send_nullfunc(aphy, vif, avp->bssid, 0);
+- break;
+- case NL80211_IFTYPE_AP:
+- /* Beacon transmission is re-enabled by aphy->state change */
+- break;
+- default:
+- break;
+- }
+-}
+-
+-/* caller must hold wiphy_lock */
+-static int __ath9k_wiphy_unpause(struct ath_wiphy *aphy)
+-{
+- ieee80211_iterate_active_interfaces_atomic(aphy->hw,
+- ath9k_unpause_iter, aphy);
+- aphy->state = ATH_WIPHY_ACTIVE;
+- ieee80211_wake_queues(aphy->hw);
+- return 0;
+-}
+-
+-int ath9k_wiphy_unpause(struct ath_wiphy *aphy)
+-{
+- int ret;
+- spin_lock_bh(&aphy->sc->wiphy_lock);
+- ret = __ath9k_wiphy_unpause(aphy);
+- spin_unlock_bh(&aphy->sc->wiphy_lock);
+- return ret;
+-}
+-
+-static void __ath9k_wiphy_mark_all_paused(struct ath_softc *sc)
+-{
+- int i;
+- if (sc->pri_wiphy->state != ATH_WIPHY_INACTIVE)
+- sc->pri_wiphy->state = ATH_WIPHY_PAUSED;
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- if (sc->sec_wiphy[i] &&
+- sc->sec_wiphy[i]->state != ATH_WIPHY_INACTIVE)
+- sc->sec_wiphy[i]->state = ATH_WIPHY_PAUSED;
+- }
+-}
+-
+-/* caller must hold wiphy_lock */
+-static void __ath9k_wiphy_pause_all(struct ath_softc *sc)
+-{
+- int i;
+- if (sc->pri_wiphy->state == ATH_WIPHY_ACTIVE)
+- __ath9k_wiphy_pause(sc->pri_wiphy);
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- if (sc->sec_wiphy[i] &&
+- sc->sec_wiphy[i]->state == ATH_WIPHY_ACTIVE)
+- __ath9k_wiphy_pause(sc->sec_wiphy[i]);
+- }
+-}
+-
+-int ath9k_wiphy_select(struct ath_wiphy *aphy)
+-{
+- struct ath_softc *sc = aphy->sc;
+- bool now;
+-
+- spin_lock_bh(&sc->wiphy_lock);
+- if (__ath9k_wiphy_scanning(sc)) {
+- /*
+- * For now, we are using mac80211 sw scan and it expects to
+- * have full control over channel changes, so avoid wiphy
+- * scheduling during a scan. This could be optimized if the
+- * scanning control were moved into the driver.
+- */
+- spin_unlock_bh(&sc->wiphy_lock);
+- return -EBUSY;
+- }
+- if (__ath9k_wiphy_pausing(sc)) {
+- if (sc->wiphy_select_failures == 0)
+- sc->wiphy_select_first_fail = jiffies;
+- sc->wiphy_select_failures++;
+- if (time_after(jiffies, sc->wiphy_select_first_fail + HZ / 2))
+- {
+- printk(KERN_DEBUG "ath9k: Previous wiphy select timed "
+- "out; disable/enable hw to recover\n");
+- __ath9k_wiphy_mark_all_paused(sc);
+- /*
+- * TODO: this workaround to fix hardware is unlikely to
+- * be specific to virtual wiphy changes. It can happen
+- * on normal channel change, too, and as such, this
+- * should really be made more generic. For example,
+- * tricker radio disable/enable on GTT interrupt burst
+- * (say, 10 GTT interrupts received without any TX
+- * frame being completed)
+- */
+- spin_unlock_bh(&sc->wiphy_lock);
+- ath_radio_disable(sc, aphy->hw);
+- ath_radio_enable(sc, aphy->hw);
+- /* Only the primary wiphy hw is used for queuing work */
+- ieee80211_queue_work(aphy->sc->hw,
+- &aphy->sc->chan_work);
+- return -EBUSY; /* previous select still in progress */
+- }
+- spin_unlock_bh(&sc->wiphy_lock);
+- return -EBUSY; /* previous select still in progress */
+- }
+- sc->wiphy_select_failures = 0;
+-
+- /* Store the new channel */
+- sc->chan_idx = aphy->chan_idx;
+- sc->chan_is_ht = aphy->chan_is_ht;
+- sc->next_wiphy = aphy;
+-
+- __ath9k_wiphy_pause_all(sc);
+- now = !__ath9k_wiphy_pausing(aphy->sc);
+- spin_unlock_bh(&sc->wiphy_lock);
+-
+- if (now) {
+- /* Ready to request channel change immediately */
+- ieee80211_queue_work(aphy->sc->hw, &aphy->sc->chan_work);
+- }
+-
+- /*
+- * wiphys will be unpaused in ath9k_tx_status() once channel has been
+- * changed if any wiphy needs time to become paused.
+- */
+-
+- return 0;
+-}
+-
+-bool ath9k_wiphy_started(struct ath_softc *sc)
+-{
+- int i;
+- spin_lock_bh(&sc->wiphy_lock);
+- if (sc->pri_wiphy->state != ATH_WIPHY_INACTIVE) {
+- spin_unlock_bh(&sc->wiphy_lock);
+- return true;
+- }
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- if (sc->sec_wiphy[i] &&
+- sc->sec_wiphy[i]->state != ATH_WIPHY_INACTIVE) {
+- spin_unlock_bh(&sc->wiphy_lock);
+- return true;
+- }
+- }
+- spin_unlock_bh(&sc->wiphy_lock);
+- return false;
+-}
+-
+-static void ath9k_wiphy_pause_chan(struct ath_wiphy *aphy,
+- struct ath_wiphy *selected)
+-{
+- if (selected->state == ATH_WIPHY_SCAN) {
+- if (aphy == selected)
+- return;
+- /*
+- * Pause all other wiphys for the duration of the scan even if
+- * they are on the current channel now.
+- */
+- } else if (aphy->chan_idx == selected->chan_idx)
+- return;
+- aphy->state = ATH_WIPHY_PAUSED;
+- ieee80211_stop_queues(aphy->hw);
+-}
+-
+-void ath9k_wiphy_pause_all_forced(struct ath_softc *sc,
+- struct ath_wiphy *selected)
+-{
+- int i;
+- spin_lock_bh(&sc->wiphy_lock);
+- if (sc->pri_wiphy->state == ATH_WIPHY_ACTIVE)
+- ath9k_wiphy_pause_chan(sc->pri_wiphy, selected);
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- if (sc->sec_wiphy[i] &&
+- sc->sec_wiphy[i]->state == ATH_WIPHY_ACTIVE)
+- ath9k_wiphy_pause_chan(sc->sec_wiphy[i], selected);
+- }
+- spin_unlock_bh(&sc->wiphy_lock);
+-}
+-
+-void ath9k_wiphy_work(struct work_struct *work)
+-{
+- struct ath_softc *sc = container_of(work, struct ath_softc,
+- wiphy_work.work);
+- struct ath_wiphy *aphy = NULL;
+- bool first = true;
+-
+- spin_lock_bh(&sc->wiphy_lock);
+-
+- if (sc->wiphy_scheduler_int == 0) {
+- /* wiphy scheduler is disabled */
+- spin_unlock_bh(&sc->wiphy_lock);
+- return;
+- }
+-
+-try_again:
+- sc->wiphy_scheduler_index++;
+- while (sc->wiphy_scheduler_index <= sc->num_sec_wiphy) {
+- aphy = sc->sec_wiphy[sc->wiphy_scheduler_index - 1];
+- if (aphy && aphy->state != ATH_WIPHY_INACTIVE)
+- break;
+-
+- sc->wiphy_scheduler_index++;
+- aphy = NULL;
+- }
+- if (aphy == NULL) {
+- sc->wiphy_scheduler_index = 0;
+- if (sc->pri_wiphy->state == ATH_WIPHY_INACTIVE) {
+- if (first) {
+- first = false;
+- goto try_again;
+- }
+- /* No wiphy is ready to be scheduled */
+- } else
+- aphy = sc->pri_wiphy;
+- }
+-
+- spin_unlock_bh(&sc->wiphy_lock);
+-
+- if (aphy &&
+- aphy->state != ATH_WIPHY_ACTIVE && aphy->state != ATH_WIPHY_SCAN &&
+- ath9k_wiphy_select(aphy)) {
+- printk(KERN_DEBUG "ath9k: Failed to schedule virtual wiphy "
+- "change\n");
+- }
+-
+- ieee80211_queue_delayed_work(sc->hw,
+- &sc->wiphy_work,
+- sc->wiphy_scheduler_int);
+-}
+-
+-void ath9k_wiphy_set_scheduler(struct ath_softc *sc, unsigned int msec_int)
+-{
+- cancel_delayed_work_sync(&sc->wiphy_work);
+- sc->wiphy_scheduler_int = msecs_to_jiffies(msec_int);
+- if (sc->wiphy_scheduler_int)
+- ieee80211_queue_delayed_work(sc->hw, &sc->wiphy_work,
+- sc->wiphy_scheduler_int);
+-}
+-
+-/* caller must hold wiphy_lock */
+-bool ath9k_all_wiphys_idle(struct ath_softc *sc)
+-{
+- unsigned int i;
+- if (!sc->pri_wiphy->idle)
+- return false;
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- struct ath_wiphy *aphy = sc->sec_wiphy[i];
+- if (!aphy)
+- continue;
+- if (!aphy->idle)
+- return false;
+- }
+- return true;
+-}
+-
+-/* caller must hold wiphy_lock */
+-void ath9k_set_wiphy_idle(struct ath_wiphy *aphy, bool idle)
+-{
+- struct ath_softc *sc = aphy->sc;
+-
+- aphy->idle = idle;
+- ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_CONFIG,
+- "Marking %s as %sidle\n",
+- wiphy_name(aphy->hw->wiphy), idle ? "" : "not-");
+-}
+-/* Only bother starting a queue on an active virtual wiphy */
+-bool ath_mac80211_start_queue(struct ath_softc *sc, u16 skb_queue)
+-{
+- struct ieee80211_hw *hw = sc->pri_wiphy->hw;
+- unsigned int i;
+- bool txq_started = false;
+-
+- spin_lock_bh(&sc->wiphy_lock);
+-
+- /* Start the primary wiphy */
+- if (sc->pri_wiphy->state == ATH_WIPHY_ACTIVE) {
+- ieee80211_wake_queue(hw, skb_queue);
+- txq_started = true;
+- goto unlock;
+- }
+-
+- /* Now start the secondary wiphy queues */
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- struct ath_wiphy *aphy = sc->sec_wiphy[i];
+- if (!aphy)
+- continue;
+- if (aphy->state != ATH_WIPHY_ACTIVE)
+- continue;
+-
+- hw = aphy->hw;
+- ieee80211_wake_queue(hw, skb_queue);
+- txq_started = true;
+- break;
+- }
+-
+-unlock:
+- spin_unlock_bh(&sc->wiphy_lock);
+- return txq_started;
+-}
+-
+-/* Go ahead and propagate information to all virtual wiphys, it won't hurt */
+-void ath_mac80211_stop_queue(struct ath_softc *sc, u16 skb_queue)
+-{
+- struct ieee80211_hw *hw = sc->pri_wiphy->hw;
+- unsigned int i;
+-
+- spin_lock_bh(&sc->wiphy_lock);
+-
+- /* Stop the primary wiphy */
+- ieee80211_stop_queue(hw, skb_queue);
+-
+- /* Now stop the secondary wiphy queues */
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- struct ath_wiphy *aphy = sc->sec_wiphy[i];
+- if (!aphy)
+- continue;
+- hw = aphy->hw;
+- ieee80211_stop_queue(hw, skb_queue);
+- }
+- spin_unlock_bh(&sc->wiphy_lock);
+-}
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -1816,7 +1816,7 @@ int ath_tx_start(struct ieee80211_hw *hw
+ spin_lock_bh(&txq->axq_lock);
+ if (txq == sc->tx.txq_map[q] &&
+ ++txq->pending_frames > ATH_MAX_QDEPTH && !txq->stopped) {
+- ath_mac80211_stop_queue(sc, q);
++ ieee80211_stop_queue(sc->hw, q);
+ txq->stopped = 1;
+ }
+ spin_unlock_bh(&txq->axq_lock);
+@@ -1874,24 +1874,20 @@ static void ath_tx_complete(struct ath_s
+ PS_WAIT_FOR_TX_ACK));
+ }
+
+- if (unlikely(ftype))
+- ath9k_tx_status(hw, skb, ftype);
+- else {
+- q = skb_get_queue_mapping(skb);
+- if (txq == sc->tx.txq_map[q]) {
+- spin_lock_bh(&txq->axq_lock);
+- if (WARN_ON(--txq->pending_frames < 0))
+- txq->pending_frames = 0;
++ q = skb_get_queue_mapping(skb);
++ if (txq == sc->tx.txq_map[q]) {
++ spin_lock_bh(&txq->axq_lock);
++ if (WARN_ON(--txq->pending_frames < 0))
++ txq->pending_frames = 0;
+
+- if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) {
+- if (ath_mac80211_start_queue(sc, q))
+- txq->stopped = 0;
+- }
+- spin_unlock_bh(&txq->axq_lock);
++ if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) {
++ ieee80211_wake_queue(sc->hw, q);
++ txq->stopped = 0;
+ }
+-
+- ieee80211_tx_status(hw, skb);
++ spin_unlock_bh(&txq->axq_lock);
+ }
++
++ ieee80211_tx_status(hw, skb);
+ }
+
+ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
+--- a/drivers/net/wireless/ath/ath9k/Makefile
++++ b/drivers/net/wireless/ath/ath9k/Makefile
+@@ -4,7 +4,6 @@ ath9k-y += beacon.o \
+ main.o \
+ recv.o \
+ xmit.o \
+- virtual.o \
+
+ ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o
+ ath9k-$(CONFIG_PCI) += pci.o
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -532,10 +532,8 @@ static void ath9k_init_misc(struct ath_s
+
+ sc->beacon.slottime = ATH9K_SLOT_TIME_9;
+
+- for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) {
++ for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++)
+ sc->beacon.bslot[i] = NULL;
+- sc->beacon.bslot_aphy[i] = NULL;
+- }
+
+ if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB)
+ sc->ant_comb.count = ATH_ANT_DIV_COMB_INIT_COUNT;
+@@ -577,7 +575,6 @@ static int ath9k_init_softc(u16 devid, s
+ common->btcoex_enabled = ath9k_btcoex_enable == 1;
+ spin_lock_init(&common->cc_lock);
+
+- spin_lock_init(&sc->wiphy_lock);
+ spin_lock_init(&sc->sc_serial_rw);
+ spin_lock_init(&sc->sc_pm_lock);
+ mutex_init(&sc->mutex);
+@@ -789,9 +786,6 @@ int ath9k_init_device(u16 devid, struct
+
+ INIT_WORK(&sc->hw_check_work, ath_hw_check);
+ INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
+- INIT_WORK(&sc->chan_work, ath9k_wiphy_chan_work);
+- INIT_DELAYED_WORK(&sc->wiphy_work, ath9k_wiphy_work);
+- sc->wiphy_scheduler_int = msecs_to_jiffies(500);
+ aphy->last_rssi = ATH_RSSI_DUMMY_MARKER;
+
+ ath_init_leds(sc);
+@@ -850,28 +844,17 @@ static void ath9k_deinit_softc(struct at
+ void ath9k_deinit_device(struct ath_softc *sc)
+ {
+ struct ieee80211_hw *hw = sc->hw;
+- int i = 0;
+
+ ath9k_ps_wakeup(sc);
+
+ wiphy_rfkill_stop_polling(sc->hw->wiphy);
+ ath_deinit_leds(sc);
+
+- for (i = 0; i < sc->num_sec_wiphy; i++) {
+- struct ath_wiphy *aphy = sc->sec_wiphy[i];
+- if (aphy == NULL)
+- continue;
+- sc->sec_wiphy[i] = NULL;
+- ieee80211_unregister_hw(aphy->hw);
+- ieee80211_free_hw(aphy->hw);
+- }
+-
+ ieee80211_unregister_hw(hw);
+ pm_qos_remove_request(&sc->pm_qos_req);
+ ath_rx_cleanup(sc);
+ ath_tx_cleanup(sc);
+ ath9k_deinit_softc(sc);
+- kfree(sc->sec_wiphy);
+ }
+
+ void ath_descdma_cleanup(struct ath_softc *sc,
+--- a/drivers/net/wireless/ath/ath9k/pci.c
++++ b/drivers/net/wireless/ath/ath9k/pci.c
+@@ -213,7 +213,6 @@ static int ath_pci_probe(struct pci_dev
+ sc = (struct ath_softc *) (aphy + 1);
+ aphy->sc = sc;
+ aphy->hw = hw;
+- sc->pri_wiphy = aphy;
+ sc->hw = hw;
+ sc->dev = &pdev->dev;
+ sc->mem = mem;
+@@ -320,7 +319,6 @@ static int ath_pci_resume(struct device
+ ath9k_ps_restore(sc);
+
+ sc->ps_idle = true;
+- ath9k_set_wiphy_idle(aphy, true);
+ ath_radio_disable(sc, hw);
+
+ return 0;
+--- a/drivers/net/wireless/ath/ath9k/ahb.c
++++ b/drivers/net/wireless/ath/ath9k/ahb.c
+@@ -107,7 +107,6 @@ static int ath_ahb_probe(struct platform
+ sc = (struct ath_softc *) (aphy + 1);
+ aphy->sc = sc;
+ aphy->hw = hw;
+- sc->pri_wiphy = aphy;
+ sc->hw = hw;
+ sc->dev = &pdev->dev;
+ sc->mem = mem;
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -142,9 +142,6 @@ static struct ath_buf *ath_beacon_genera
+ struct ieee80211_tx_info *info;
+ int cabq_depth;
+
+- if (aphy->state != ATH_WIPHY_ACTIVE)
+- return NULL;
+-
+ avp = (void *)vif->drv_priv;
+ cabq = sc->beacon.cabq;
+
+@@ -261,7 +258,6 @@ int ath_beacon_alloc(struct ath_wiphy *a
+ }
+ BUG_ON(sc->beacon.bslot[avp->av_bslot] != NULL);
+ sc->beacon.bslot[avp->av_bslot] = vif;
+- sc->beacon.bslot_aphy[avp->av_bslot] = aphy;
+ sc->nbcnvifs++;
+ }
+ }
+@@ -332,7 +328,6 @@ void ath_beacon_return(struct ath_softc
+
+ if (avp->av_bslot != -1) {
+ sc->beacon.bslot[avp->av_bslot] = NULL;
+- sc->beacon.bslot_aphy[avp->av_bslot] = NULL;
+ sc->nbcnvifs--;
+ }
+
+@@ -358,7 +353,6 @@ void ath_beacon_tasklet(unsigned long da
+ struct ath_common *common = ath9k_hw_common(ah);
+ struct ath_buf *bf = NULL;
+ struct ieee80211_vif *vif;
+- struct ath_wiphy *aphy;
+ int slot;
+ u32 bfaddr, bc = 0, tsftu;
+ u64 tsf;
+@@ -416,7 +410,6 @@ void ath_beacon_tasklet(unsigned long da
+ */
+ slot = ATH_BCBUF - slot - 1;
+ vif = sc->beacon.bslot[slot];
+- aphy = sc->beacon.bslot_aphy[slot];
+
+ ath_dbg(common, ATH_DBG_BEACON,
+ "slot %d [tsf %llu tsftu %u intval %u] vif %p\n",
+@@ -424,7 +417,7 @@ void ath_beacon_tasklet(unsigned long da
+
+ bfaddr = 0;
+ if (vif) {
+- bf = ath_beacon_generate(aphy->hw, vif);
++ bf = ath_beacon_generate(sc->hw, vif);
+ if (bf != NULL) {
+ bfaddr = bf->bf_daddr;
+ bc = 1;
--- /dev/null
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -57,8 +57,9 @@ static void ath_tx_complete_buf(struct a
+ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,
+ struct list_head *head);
+ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, int len);
+-static void ath_tx_rc_status(struct ath_buf *bf, struct ath_tx_status *ts,
+- int nframes, int nbad, int txok, bool update_rc);
++static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,
++ struct ath_tx_status *ts, int nframes, int nbad,
++ int txok, bool update_rc);
+ static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
+ int seqno);
+
+@@ -297,7 +298,6 @@ static struct ath_buf* ath_clone_txbuf(s
+
+ ATH_TXBUF_RESET(tbf);
+
+- tbf->aphy = bf->aphy;
+ tbf->bf_mpdu = bf->bf_mpdu;
+ tbf->bf_buf_addr = bf->bf_buf_addr;
+ memcpy(tbf->bf_desc, bf->bf_desc, sc->sc_ah->caps.tx_desc_len);
+@@ -345,7 +345,7 @@ static void ath_tx_complete_aggr(struct
+ struct ath_node *an = NULL;
+ struct sk_buff *skb;
+ struct ieee80211_sta *sta;
+- struct ieee80211_hw *hw;
++ struct ieee80211_hw *hw = sc->hw;
+ struct ieee80211_hdr *hdr;
+ struct ieee80211_tx_info *tx_info;
+ struct ath_atx_tid *tid = NULL;
+@@ -364,7 +364,6 @@ static void ath_tx_complete_aggr(struct
+ hdr = (struct ieee80211_hdr *)skb->data;
+
+ tx_info = IEEE80211_SKB_CB(skb);
+- hw = bf->aphy->hw;
+
+ memcpy(rates, tx_info->control.rates, sizeof(rates));
+
+@@ -383,7 +382,7 @@ static void ath_tx_complete_aggr(struct
+ !bf->bf_stale || bf_next != NULL)
+ list_move_tail(&bf->list, &bf_head);
+
+- ath_tx_rc_status(bf, ts, 1, 1, 0, false);
++ ath_tx_rc_status(sc, bf, ts, 1, 1, 0, false);
+ ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,
+ 0, 0);
+
+@@ -489,10 +488,10 @@ static void ath_tx_complete_aggr(struct
+
+ if (rc_update && (acked_cnt == 1 || txfail_cnt == 1)) {
+ memcpy(tx_info->control.rates, rates, sizeof(rates));
+- ath_tx_rc_status(bf, ts, nframes, nbad, txok, true);
++ ath_tx_rc_status(sc, bf, ts, nframes, nbad, txok, true);
+ rc_update = false;
+ } else {
+- ath_tx_rc_status(bf, ts, nframes, nbad, txok, false);
++ ath_tx_rc_status(sc, bf, ts, nframes, nbad, txok, false);
+ }
+
+ ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,
+@@ -516,7 +515,7 @@ static void ath_tx_complete_aggr(struct
+
+ bf->bf_state.bf_type |=
+ BUF_XRETRY;
+- ath_tx_rc_status(bf, ts, nframes,
++ ath_tx_rc_status(sc, bf, ts, nframes,
+ nbad, 0, false);
+ ath_tx_complete_buf(sc, bf, txq,
+ &bf_head,
+@@ -1677,7 +1676,6 @@ static struct ath_buf *ath_tx_setup_buff
+
+ ATH_TXBUF_RESET(bf);
+
+- bf->aphy = aphy;
+ bf->bf_flags = setup_tx_flags(skb);
+ bf->bf_mpdu = skb;
+
+@@ -1831,8 +1829,7 @@ int ath_tx_start(struct ieee80211_hw *hw
+ /*****************/
+
+ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
+- struct ath_wiphy *aphy, int tx_flags, int ftype,
+- struct ath_txq *txq)
++ int tx_flags, int ftype, struct ath_txq *txq)
+ {
+ struct ieee80211_hw *hw = sc->hw;
+ struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+@@ -1842,9 +1839,6 @@ static void ath_tx_complete(struct ath_s
+
+ ath_dbg(common, ATH_DBG_XMIT, "TX complete: skb: %p\n", skb);
+
+- if (aphy)
+- hw = aphy->hw;
+-
+ if (tx_flags & ATH_TX_BAR)
+ tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
+
+@@ -1918,7 +1912,7 @@ static void ath_tx_complete_buf(struct a
+ complete(&sc->paprd_complete);
+ } else {
+ ath_debug_stat_tx(sc, bf, ts);
+- ath_tx_complete(sc, skb, bf->aphy, tx_flags,
++ ath_tx_complete(sc, skb, tx_flags,
+ bf->bf_state.bfs_ftype, txq);
+ }
+ /* At this point, skb (bf->bf_mpdu) is consumed...make sure we don't
+@@ -1934,14 +1928,14 @@ static void ath_tx_complete_buf(struct a
+ spin_unlock_irqrestore(&sc->tx.txbuflock, flags);
+ }
+
+-static void ath_tx_rc_status(struct ath_buf *bf, struct ath_tx_status *ts,
+- int nframes, int nbad, int txok, bool update_rc)
++static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,
++ struct ath_tx_status *ts, int nframes, int nbad,
++ int txok, bool update_rc)
+ {
+ struct sk_buff *skb = bf->bf_mpdu;
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+ struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+- struct ieee80211_hw *hw = bf->aphy->hw;
+- struct ath_softc *sc = bf->aphy->sc;
++ struct ieee80211_hw *hw = sc->hw;
+ struct ath_hw *ah = sc->sc_ah;
+ u8 i, tx_rateindex;
+
+@@ -2077,7 +2071,7 @@ static void ath_tx_processq(struct ath_s
+ */
+ if (ts.ts_status & ATH9K_TXERR_XRETRY)
+ bf->bf_state.bf_type |= BUF_XRETRY;
+- ath_tx_rc_status(bf, &ts, 1, txok ? 0 : 1, txok, true);
++ ath_tx_rc_status(sc, bf, &ts, 1, txok ? 0 : 1, txok, true);
+ }
+
+ if (bf_isampdu(bf))
+@@ -2196,7 +2190,7 @@ void ath_tx_edma_tasklet(struct ath_soft
+ if (!bf_isampdu(bf)) {
+ if (txs.ts_status & ATH9K_TXERR_XRETRY)
+ bf->bf_state.bf_type |= BUF_XRETRY;
+- ath_tx_rc_status(bf, &txs, 1, txok ? 0 : 1, txok, true);
++ ath_tx_rc_status(sc, bf, &txs, 1, txok ? 0 : 1, txok, true);
+ }
+
+ if (bf_isampdu(bf))
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -32,6 +32,7 @@
+ */
+
+ struct ath_node;
++struct ath_wiphy;
+
+ /* Macro to expand scalars to 64-bit objects */
+
+@@ -233,7 +234,6 @@ struct ath_buf {
+ bool bf_stale;
+ u16 bf_flags;
+ struct ath_buf_state bf_state;
+- struct ath_wiphy *aphy;
+ };
+
+ struct ath_atx_tid {
+@@ -550,7 +550,6 @@ struct ath_ant_comb {
+ #define PS_WAIT_FOR_TX_ACK BIT(3)
+ #define PS_BEACON_SYNC BIT(4)
+
+-struct ath_wiphy;
+ struct ath_rate_table;
+
+ struct ath9k_vif_iter_data {
--- /dev/null
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -32,7 +32,6 @@
+ */
+
+ struct ath_node;
+-struct ath_wiphy;
+
+ /* Macro to expand scalars to 64-bit objects */
+
+@@ -391,7 +390,7 @@ struct ath_beacon {
+
+ void ath_beacon_tasklet(unsigned long data);
+ void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif);
+-int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif);
++int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_vif *vif);
+ void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp);
+ int ath_beaconq_config(struct ath_softc *sc);
+
+@@ -611,6 +610,9 @@ struct ath_softc {
+ struct led_classdev led_cdev;
+ #endif
+
++ struct ath9k_hw_cal_data caldata;
++ int last_rssi;
++
+ int beacon_interval;
+
+ #ifdef CONFIG_ATH9K_DEBUGFS
+@@ -627,13 +629,6 @@ struct ath_softc {
+ struct pm_qos_request_list pm_qos_req;
+ };
+
+-struct ath_wiphy {
+- struct ath_softc *sc; /* shared for all virtual wiphys */
+- struct ieee80211_hw *hw;
+- struct ath9k_hw_cal_data caldata;
+- int last_rssi;
+-};
+-
+ void ath9k_tasklet(unsigned long data);
+ int ath_reset(struct ath_softc *sc, bool retry_tx);
+ int ath_cabq_update(struct ath_softc *);
+--- a/drivers/net/wireless/ath/ath9k/ahb.c
++++ b/drivers/net/wireless/ath/ath9k/ahb.c
+@@ -54,7 +54,6 @@ static struct ath_bus_ops ath_ahb_bus_op
+ static int ath_ahb_probe(struct platform_device *pdev)
+ {
+ void __iomem *mem;
+- struct ath_wiphy *aphy;
+ struct ath_softc *sc;
+ struct ieee80211_hw *hw;
+ struct resource *res;
+@@ -92,8 +91,7 @@ static int ath_ahb_probe(struct platform
+
+ irq = res->start;
+
+- hw = ieee80211_alloc_hw(sizeof(struct ath_wiphy) +
+- sizeof(struct ath_softc), &ath9k_ops);
++ hw = ieee80211_alloc_hw(sizeof(struct ath_softc), &ath9k_ops);
+ if (hw == NULL) {
+ dev_err(&pdev->dev, "no memory for ieee80211_hw\n");
+ ret = -ENOMEM;
+@@ -103,10 +101,7 @@ static int ath_ahb_probe(struct platform
+ SET_IEEE80211_DEV(hw, &pdev->dev);
+ platform_set_drvdata(pdev, hw);
+
+- aphy = hw->priv;
+- sc = (struct ath_softc *) (aphy + 1);
+- aphy->sc = sc;
+- aphy->hw = hw;
++ sc = hw->priv;
+ sc->hw = hw;
+ sc->dev = &pdev->dev;
+ sc->mem = mem;
+@@ -150,8 +145,7 @@ static int ath_ahb_remove(struct platfor
+ struct ieee80211_hw *hw = platform_get_drvdata(pdev);
+
+ if (hw) {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ void __iomem *mem = sc->mem;
+
+ ath9k_deinit_device(sc);
+--- a/drivers/net/wireless/ath/ath9k/pci.c
++++ b/drivers/net/wireless/ath/ath9k/pci.c
+@@ -126,7 +126,6 @@ static const struct ath_bus_ops ath_pci_
+ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+ {
+ void __iomem *mem;
+- struct ath_wiphy *aphy;
+ struct ath_softc *sc;
+ struct ieee80211_hw *hw;
+ u8 csz;
+@@ -198,8 +197,7 @@ static int ath_pci_probe(struct pci_dev
+ goto err_iomap;
+ }
+
+- hw = ieee80211_alloc_hw(sizeof(struct ath_wiphy) +
+- sizeof(struct ath_softc), &ath9k_ops);
++ hw = ieee80211_alloc_hw(sizeof(struct ath_softc), &ath9k_ops);
+ if (!hw) {
+ dev_err(&pdev->dev, "No memory for ieee80211_hw\n");
+ ret = -ENOMEM;
+@@ -209,10 +207,7 @@ static int ath_pci_probe(struct pci_dev
+ SET_IEEE80211_DEV(hw, &pdev->dev);
+ pci_set_drvdata(pdev, hw);
+
+- aphy = hw->priv;
+- sc = (struct ath_softc *) (aphy + 1);
+- aphy->sc = sc;
+- aphy->hw = hw;
++ sc = hw->priv;
+ sc->hw = hw;
+ sc->dev = &pdev->dev;
+ sc->mem = mem;
+@@ -259,8 +254,7 @@ err_dma:
+ static void ath_pci_remove(struct pci_dev *pdev)
+ {
+ struct ieee80211_hw *hw = pci_get_drvdata(pdev);
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ void __iomem *mem = sc->mem;
+
+ if (!is_ath9k_unloaded)
+@@ -280,8 +274,7 @@ static int ath_pci_suspend(struct device
+ {
+ struct pci_dev *pdev = to_pci_dev(device);
+ struct ieee80211_hw *hw = pci_get_drvdata(pdev);
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+
+ ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 1);
+
+@@ -292,8 +285,7 @@ static int ath_pci_resume(struct device
+ {
+ struct pci_dev *pdev = to_pci_dev(device);
+ struct ieee80211_hw *hw = pci_get_drvdata(pdev);
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ u32 val;
+
+ /*
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -112,8 +112,7 @@ static void ath_beacon_setup(struct ath_
+
+ static void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+ struct ath_tx_control txctl;
+
+@@ -132,8 +131,7 @@ static void ath_tx_cabq(struct ieee80211
+ static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+ struct ath_buf *bf;
+ struct ath_vif *avp;
+@@ -222,9 +220,8 @@ static struct ath_buf *ath_beacon_genera
+ return bf;
+ }
+
+-int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif)
++int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_vif *vif)
+ {
+- struct ath_softc *sc = aphy->sc;
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+ struct ath_vif *avp;
+ struct ath_buf *bf;
+--- a/drivers/net/wireless/ath/ath9k/gpio.c
++++ b/drivers/net/wireless/ath/ath9k/gpio.c
+@@ -88,8 +88,7 @@ static bool ath_is_rfkill_set(struct ath
+
+ void ath9k_rfkill_poll_state(struct ieee80211_hw *hw)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ bool blocked = !!ath_is_rfkill_set(sc);
+
+ wiphy_rfkill_set_hw_state(hw->wiphy, blocked);
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -270,8 +270,7 @@ static int ath9k_reg_notifier(struct wip
+ struct regulatory_request *request)
+ {
+ struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_regulatory *reg = ath9k_hw_regulatory(sc->sc_ah);
+
+ return ath_reg_notifier_apply(wiphy, request, reg);
+@@ -724,7 +723,6 @@ int ath9k_init_device(u16 devid, struct
+ const struct ath_bus_ops *bus_ops)
+ {
+ struct ieee80211_hw *hw = sc->hw;
+- struct ath_wiphy *aphy = hw->priv;
+ struct ath_common *common;
+ struct ath_hw *ah;
+ int error = 0;
+@@ -786,7 +784,7 @@ int ath9k_init_device(u16 devid, struct
+
+ INIT_WORK(&sc->hw_check_work, ath_hw_check);
+ INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
+- aphy->last_rssi = ATH_RSSI_DUMMY_MARKER;
++ sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
+
+ ath_init_leds(sc);
+ ath_start_rfkill_poll(sc);
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -215,7 +215,6 @@ static void ath_update_survey_stats(stru
+ int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,
+ struct ath9k_channel *hchan)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
+ struct ieee80211_conf *conf = &common->hw->conf;
+@@ -262,7 +261,7 @@ int ath_set_channel(struct ath_softc *sc
+ fastcc = false;
+
+ if (!(sc->sc_flags & SC_OP_OFFCHANNEL))
+- caldata = &aphy->caldata;
++ caldata = &sc->caldata;
+
+ ath_dbg(common, ATH_DBG_CONFIG,
+ "(%u MHz) -> (%u MHz), conf_is_ht40: %d fastcc: %d\n",
+@@ -841,7 +840,6 @@ static void ath9k_bss_assoc_info(struct
+ struct ieee80211_vif *vif,
+ struct ieee80211_bss_conf *bss_conf)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
+
+@@ -865,7 +863,7 @@ static void ath9k_bss_assoc_info(struct
+ ath_beacon_config(sc, vif);
+
+ /* Reset rssi stats */
+- aphy->last_rssi = ATH_RSSI_DUMMY_MARKER;
++ sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
+ sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
+
+ sc->sc_flags |= SC_OP_ANI_RUN;
+@@ -1062,8 +1060,7 @@ void ath9k_update_ichannel(struct ath_so
+
+ static int ath9k_start(struct ieee80211_hw *hw)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
+ struct ieee80211_channel *curchan = hw->conf.channel;
+@@ -1180,8 +1177,7 @@ mutex_unlock:
+ static int ath9k_tx(struct ieee80211_hw *hw,
+ struct sk_buff *skb)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+ struct ath_tx_control txctl;
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+@@ -1244,8 +1240,7 @@ exit:
+
+ static void ath9k_stop(struct ieee80211_hw *hw)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
+
+@@ -1377,8 +1372,7 @@ void ath9k_calculate_iter_data(struct ie
+ struct ieee80211_vif *vif,
+ struct ath9k_vif_iter_data *iter_data)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
+
+@@ -1402,8 +1396,7 @@ void ath9k_calculate_iter_data(struct ie
+ static void ath9k_calculate_summary_state(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
+ struct ath9k_vif_iter_data iter_data;
+@@ -1459,8 +1452,7 @@ static void ath9k_calculate_summary_stat
+ static void ath9k_do_vif_add_setup(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+
+ ath9k_calculate_summary_state(hw, vif);
+
+@@ -1473,7 +1465,7 @@ static void ath9k_do_vif_add_setup(struc
+ * in the info_changed method and set up beacons properly
+ * there.
+ */
+- error = ath_beacon_alloc(aphy, vif);
++ error = ath_beacon_alloc(sc, vif);
+ if (error)
+ ath9k_reclaim_beacon(sc, vif);
+ else
+@@ -1485,8 +1477,7 @@ static void ath9k_do_vif_add_setup(struc
+ static int ath9k_add_interface(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
+ struct ath_vif *avp = (void *)vif->drv_priv;
+@@ -1546,8 +1537,7 @@ static int ath9k_change_interface(struct
+ enum nl80211_iftype new_type,
+ bool p2p)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+ int ret = 0;
+
+@@ -1589,8 +1579,7 @@ out:
+ static void ath9k_remove_interface(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+
+ ath_dbg(common, ATH_DBG_CONFIG, "Detach Interface\n");
+@@ -1644,8 +1633,7 @@ static void ath9k_disable_ps(struct ath_
+
+ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
+ struct ieee80211_conf *conf = &hw->conf;
+@@ -1789,8 +1777,7 @@ static void ath9k_configure_filter(struc
+ unsigned int *total_flags,
+ u64 multicast)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ u32 rfilt;
+
+ changed_flags &= SUPPORTED_FILTERS;
+@@ -1810,8 +1797,7 @@ static int ath9k_sta_add(struct ieee8021
+ struct ieee80211_vif *vif,
+ struct ieee80211_sta *sta)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+
+ ath_node_attach(sc, sta);
+
+@@ -1822,8 +1808,7 @@ static int ath9k_sta_remove(struct ieee8
+ struct ieee80211_vif *vif,
+ struct ieee80211_sta *sta)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+
+ ath_node_detach(sc, sta);
+
+@@ -1833,8 +1818,7 @@ static int ath9k_sta_remove(struct ieee8
+ static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,
+ const struct ieee80211_tx_queue_params *params)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+ struct ath_txq *txq;
+ struct ath9k_tx_queue_info qi;
+@@ -1878,8 +1862,7 @@ static int ath9k_set_key(struct ieee8021
+ struct ieee80211_sta *sta,
+ struct ieee80211_key_conf *key)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+ int ret = 0;
+
+@@ -1923,8 +1906,7 @@ static void ath9k_bss_info_changed(struc
+ struct ieee80211_bss_conf *bss_conf,
+ u32 changed)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
+ struct ath_vif *avp = (void *)vif->drv_priv;
+@@ -1954,7 +1936,7 @@ static void ath9k_bss_info_changed(struc
+ if ((changed & BSS_CHANGED_BEACON) ||
+ ((changed & BSS_CHANGED_BEACON_ENABLED) && bss_conf->enable_beacon)) {
+ ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);
+- error = ath_beacon_alloc(aphy, vif);
++ error = ath_beacon_alloc(sc, vif);
+ if (!error)
+ ath_beacon_config(sc, vif);
+ }
+@@ -1991,7 +1973,7 @@ static void ath9k_bss_info_changed(struc
+ if (vif->type == NL80211_IFTYPE_AP) {
+ sc->sc_flags |= SC_OP_TSF_RESET;
+ ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);
+- error = ath_beacon_alloc(aphy, vif);
++ error = ath_beacon_alloc(sc, vif);
+ if (!error)
+ ath_beacon_config(sc, vif);
+ } else {
+@@ -2029,9 +2011,8 @@ static void ath9k_bss_info_changed(struc
+
+ static u64 ath9k_get_tsf(struct ieee80211_hw *hw)
+ {
++ struct ath_softc *sc = hw->priv;
+ u64 tsf;
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
+
+ mutex_lock(&sc->mutex);
+ ath9k_ps_wakeup(sc);
+@@ -2044,8 +2025,7 @@ static u64 ath9k_get_tsf(struct ieee8021
+
+ static void ath9k_set_tsf(struct ieee80211_hw *hw, u64 tsf)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+
+ mutex_lock(&sc->mutex);
+ ath9k_ps_wakeup(sc);
+@@ -2056,8 +2036,7 @@ static void ath9k_set_tsf(struct ieee802
+
+ static void ath9k_reset_tsf(struct ieee80211_hw *hw)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+
+ mutex_lock(&sc->mutex);
+
+@@ -2074,8 +2053,7 @@ static int ath9k_ampdu_action(struct iee
+ struct ieee80211_sta *sta,
+ u16 tid, u16 *ssn, u8 buf_size)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ int ret = 0;
+
+ local_bh_disable();
+@@ -2120,8 +2098,7 @@ static int ath9k_ampdu_action(struct iee
+ static int ath9k_get_survey(struct ieee80211_hw *hw, int idx,
+ struct survey_info *survey)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+ struct ieee80211_supported_band *sband;
+ struct ieee80211_channel *chan;
+@@ -2157,8 +2134,7 @@ static int ath9k_get_survey(struct ieee8
+
+ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_hw *ah = sc->sc_ah;
+
+ mutex_lock(&sc->mutex);
+--- a/drivers/net/wireless/ath/ath9k/rc.c
++++ b/drivers/net/wireless/ath/ath9k/rc.c
+@@ -1560,8 +1560,7 @@ static void ath_rate_add_sta_debugfs(voi
+
+ static void *ath_rate_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- return aphy->sc;
++ return hw->priv;
+ }
+
+ static void ath_rate_free(void *priv)
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -927,7 +927,7 @@ static void ath9k_process_rssi(struct at
+ struct ieee80211_hdr *hdr,
+ struct ath_rx_status *rx_stats)
+ {
+- struct ath_wiphy *aphy = hw->priv;
++ struct ath_softc *sc = hw->priv;
+ struct ath_hw *ah = common->ah;
+ int last_rssi;
+ __le16 fc;
+@@ -947,9 +947,9 @@ static void ath9k_process_rssi(struct at
+ }
+
+ if (rx_stats->rs_rssi != ATH9K_RSSI_BAD && !rx_stats->rs_moreaggr)
+- ATH_RSSI_LPF(aphy->last_rssi, rx_stats->rs_rssi);
++ ATH_RSSI_LPF(sc->last_rssi, rx_stats->rs_rssi);
+
+- last_rssi = aphy->last_rssi;
++ last_rssi = sc->last_rssi;
+ if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
+ rx_stats->rs_rssi = ATH_EP_RND(last_rssi,
+ ATH_RSSI_EP_MULTIPLIER);
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -1440,8 +1440,7 @@ static enum ath9k_pkt_type get_hw_packet
+ static void setup_frame_info(struct ieee80211_hw *hw, struct sk_buff *skb,
+ int framelen)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+ struct ieee80211_sta *sta = tx_info->control.sta;
+ struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;
+@@ -1659,8 +1658,7 @@ static struct ath_buf *ath_tx_setup_buff
+ struct ath_txq *txq,
+ struct sk_buff *skb)
+ {
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+ struct ath_frame_info *fi = get_frame_info(skb);
+@@ -1761,8 +1759,7 @@ int ath_tx_start(struct ieee80211_hw *hw
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+ struct ieee80211_sta *sta = info->control.sta;
+- struct ath_wiphy *aphy = hw->priv;
+- struct ath_softc *sc = aphy->sc;
++ struct ath_softc *sc = hw->priv;
+ struct ath_txq *txq = txctl->txq;
+ struct ath_buf *bf;
+ int padpos, padsize;
projects / openwrt / staging / rmilecki.git / commitdiff