ath9k: Enable dynamic power save in ath9k.
[pandora-kernel.git] / drivers / net / wireless / ath9k / main.c
index fbb2dd2..b494a0d 100644 (file)
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* mac80211 and PCI callbacks */
-
 #include <linux/nl80211.h>
 #include "core.h"
 #include "reg.h"
+#include "hw.h"
 
 #define ATH_PCI_VERSION "0.1"
 
@@ -29,16 +28,559 @@ MODULE_DESCRIPTION("Support for Atheros 802.11n wireless LAN cards.");
 MODULE_SUPPORTED_DEVICE("Atheros 802.11n WLAN cards");
 MODULE_LICENSE("Dual BSD/GPL");
 
-static struct pci_device_id ath_pci_id_table[] __devinitdata = {
-       { PCI_VDEVICE(ATHEROS, 0x0023) }, /* PCI   */
-       { PCI_VDEVICE(ATHEROS, 0x0024) }, /* PCI-E */
-       { PCI_VDEVICE(ATHEROS, 0x0027) }, /* PCI   */
-       { PCI_VDEVICE(ATHEROS, 0x0029) }, /* PCI   */
-       { PCI_VDEVICE(ATHEROS, 0x002A) }, /* PCI-E */
-       { 0 }
-};
+static void ath_cache_conf_rate(struct ath_softc *sc,
+                               struct ieee80211_conf *conf)
+{
+       switch (conf->channel->band) {
+       case IEEE80211_BAND_2GHZ:
+               if (conf_is_ht20(conf))
+                       sc->cur_rate_table =
+                         sc->hw_rate_table[ATH9K_MODE_11NG_HT20];
+               else if (conf_is_ht40_minus(conf))
+                       sc->cur_rate_table =
+                         sc->hw_rate_table[ATH9K_MODE_11NG_HT40MINUS];
+               else if (conf_is_ht40_plus(conf))
+                       sc->cur_rate_table =
+                         sc->hw_rate_table[ATH9K_MODE_11NG_HT40PLUS];
+               else
+                       sc->cur_rate_table =
+                         sc->hw_rate_table[ATH9K_MODE_11G];
+               break;
+       case IEEE80211_BAND_5GHZ:
+               if (conf_is_ht20(conf))
+                       sc->cur_rate_table =
+                         sc->hw_rate_table[ATH9K_MODE_11NA_HT20];
+               else if (conf_is_ht40_minus(conf))
+                       sc->cur_rate_table =
+                         sc->hw_rate_table[ATH9K_MODE_11NA_HT40MINUS];
+               else if (conf_is_ht40_plus(conf))
+                       sc->cur_rate_table =
+                         sc->hw_rate_table[ATH9K_MODE_11NA_HT40PLUS];
+               else
+                       sc->cur_rate_table =
+                         sc->hw_rate_table[ATH9K_MODE_11A];
+               break;
+       default:
+               BUG_ON(1);
+               break;
+       }
+}
+
+static void ath_update_txpow(struct ath_softc *sc)
+{
+       struct ath_hal *ah = sc->sc_ah;
+       u32 txpow;
+
+       if (sc->sc_curtxpow != sc->sc_config.txpowlimit) {
+               ath9k_hw_set_txpowerlimit(ah, sc->sc_config.txpowlimit);
+               /* read back in case value is clamped */
+               ath9k_hw_getcapability(ah, ATH9K_CAP_TXPOW, 1, &txpow);
+               sc->sc_curtxpow = txpow;
+       }
+}
+
+static u8 parse_mpdudensity(u8 mpdudensity)
+{
+       /*
+        * 802.11n D2.0 defined values for "Minimum MPDU Start Spacing":
+        *   0 for no restriction
+        *   1 for 1/4 us
+        *   2 for 1/2 us
+        *   3 for 1 us
+        *   4 for 2 us
+        *   5 for 4 us
+        *   6 for 8 us
+        *   7 for 16 us
+        */
+       switch (mpdudensity) {
+       case 0:
+               return 0;
+       case 1:
+       case 2:
+       case 3:
+               /* Our lower layer calculations limit our precision to
+                  1 microsecond */
+               return 1;
+       case 4:
+               return 2;
+       case 5:
+               return 4;
+       case 6:
+               return 8;
+       case 7:
+               return 16;
+       default:
+               return 0;
+       }
+}
+
+static void ath_setup_rates(struct ath_softc *sc, enum ieee80211_band band)
+{
+       struct ath_rate_table *rate_table = NULL;
+       struct ieee80211_supported_band *sband;
+       struct ieee80211_rate *rate;
+       int i, maxrates;
+
+       switch (band) {
+       case IEEE80211_BAND_2GHZ:
+               rate_table = sc->hw_rate_table[ATH9K_MODE_11G];
+               break;
+       case IEEE80211_BAND_5GHZ:
+               rate_table = sc->hw_rate_table[ATH9K_MODE_11A];
+               break;
+       default:
+               break;
+       }
+
+       if (rate_table == NULL)
+               return;
+
+       sband = &sc->sbands[band];
+       rate = sc->rates[band];
+
+       if (rate_table->rate_cnt > ATH_RATE_MAX)
+               maxrates = ATH_RATE_MAX;
+       else
+               maxrates = rate_table->rate_cnt;
+
+       for (i = 0; i < maxrates; i++) {
+               rate[i].bitrate = rate_table->info[i].ratekbps / 100;
+               rate[i].hw_value = rate_table->info[i].ratecode;
+               sband->n_bitrates++;
+               DPRINTF(sc, ATH_DBG_CONFIG, "Rate: %2dMbps, ratecode: %2d\n",
+                       rate[i].bitrate / 10, rate[i].hw_value);
+       }
+}
+
+static int ath_setup_channels(struct ath_softc *sc)
+{
+       struct ath_hal *ah = sc->sc_ah;
+       int nchan, i, a = 0, b = 0;
+       u8 regclassids[ATH_REGCLASSIDS_MAX];
+       u32 nregclass = 0;
+       struct ieee80211_supported_band *band_2ghz;
+       struct ieee80211_supported_band *band_5ghz;
+       struct ieee80211_channel *chan_2ghz;
+       struct ieee80211_channel *chan_5ghz;
+       struct ath9k_channel *c;
+
+       /* Fill in ah->ah_channels */
+       if (!ath9k_regd_init_channels(ah, ATH_CHAN_MAX, (u32 *)&nchan,
+                                     regclassids, ATH_REGCLASSIDS_MAX,
+                                     &nregclass, CTRY_DEFAULT, false, 1)) {
+               u32 rd = ah->ah_currentRD;
+               DPRINTF(sc, ATH_DBG_FATAL,
+                       "Unable to collect channel list; "
+                       "regdomain likely %u country code %u\n",
+                       rd, CTRY_DEFAULT);
+               return -EINVAL;
+       }
+
+       band_2ghz = &sc->sbands[IEEE80211_BAND_2GHZ];
+       band_5ghz = &sc->sbands[IEEE80211_BAND_5GHZ];
+       chan_2ghz = sc->channels[IEEE80211_BAND_2GHZ];
+       chan_5ghz = sc->channels[IEEE80211_BAND_5GHZ];
+
+       for (i = 0; i < nchan; i++) {
+               c = &ah->ah_channels[i];
+               if (IS_CHAN_2GHZ(c)) {
+                       chan_2ghz[a].band = IEEE80211_BAND_2GHZ;
+                       chan_2ghz[a].center_freq = c->channel;
+                       chan_2ghz[a].max_power = c->maxTxPower;
+                       c->chan = &chan_2ghz[a];
+
+                       if (c->privFlags & CHANNEL_DISALLOW_ADHOC)
+                               chan_2ghz[a].flags |= IEEE80211_CHAN_NO_IBSS;
+                       if (c->channelFlags & CHANNEL_PASSIVE)
+                               chan_2ghz[a].flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+
+                       band_2ghz->n_channels = ++a;
+
+                       DPRINTF(sc, ATH_DBG_CONFIG, "2MHz channel: %d, "
+                               "channelFlags: 0x%x\n",
+                               c->channel, c->channelFlags);
+               } else if (IS_CHAN_5GHZ(c)) {
+                       chan_5ghz[b].band = IEEE80211_BAND_5GHZ;
+                       chan_5ghz[b].center_freq = c->channel;
+                       chan_5ghz[b].max_power = c->maxTxPower;
+                       c->chan = &chan_5ghz[a];
+
+                       if (c->privFlags & CHANNEL_DISALLOW_ADHOC)
+                               chan_5ghz[b].flags |= IEEE80211_CHAN_NO_IBSS;
+                       if (c->channelFlags & CHANNEL_PASSIVE)
+                               chan_5ghz[b].flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+
+                       band_5ghz->n_channels = ++b;
+
+                       DPRINTF(sc, ATH_DBG_CONFIG, "5MHz channel: %d, "
+                               "channelFlags: 0x%x\n",
+                               c->channel, c->channelFlags);
+               }
+       }
+
+       return 0;
+}
+
+/*
+ * Set/change channels.  If the channel is really being changed, it's done
+ * by reseting the chip.  To accomplish this we must first cleanup any pending
+ * DMA, then restart stuff.
+*/
+static int ath_set_channel(struct ath_softc *sc, struct ath9k_channel *hchan)
+{
+       struct ath_hal *ah = sc->sc_ah;
+       bool fastcc = true, stopped;
+       struct ieee80211_hw *hw = sc->hw;
+       struct ieee80211_channel *channel = hw->conf.channel;
+       int r;
+
+       if (sc->sc_flags & SC_OP_INVALID)
+               return -EIO;
+
+       ath9k_ps_wakeup(sc);
+
+       /*
+        * This is only performed if the channel settings have
+        * actually changed.
+        *
+        * To switch channels clear any pending DMA operations;
+        * wait long enough for the RX fifo to drain, reset the
+        * hardware at the new frequency, and then re-enable
+        * the relevant bits of the h/w.
+        */
+       ath9k_hw_set_interrupts(ah, 0);
+       ath_drain_all_txq(sc, false);
+       stopped = ath_stoprecv(sc);
+
+       /* XXX: do not flush receive queue here. We don't want
+        * to flush data frames already in queue because of
+        * changing channel. */
+
+       if (!stopped || (sc->sc_flags & SC_OP_FULL_RESET))
+               fastcc = false;
+
+       DPRINTF(sc, ATH_DBG_CONFIG,
+               "(%u MHz) -> (%u MHz), chanwidth: %d\n",
+               sc->sc_ah->ah_curchan->channel,
+               channel->center_freq, sc->tx_chan_width);
+
+       spin_lock_bh(&sc->sc_resetlock);
+
+       r = ath9k_hw_reset(ah, hchan, fastcc);
+       if (r) {
+               DPRINTF(sc, ATH_DBG_FATAL,
+                       "Unable to reset channel (%u Mhz) "
+                       "reset status %u\n",
+                       channel->center_freq, r);
+               spin_unlock_bh(&sc->sc_resetlock);
+               return r;
+       }
+       spin_unlock_bh(&sc->sc_resetlock);
+
+       sc->sc_flags &= ~SC_OP_CHAINMASK_UPDATE;
+       sc->sc_flags &= ~SC_OP_FULL_RESET;
+
+       if (ath_startrecv(sc) != 0) {
+               DPRINTF(sc, ATH_DBG_FATAL,
+                       "Unable to restart recv logic\n");
+               return -EIO;
+       }
+
+       ath_cache_conf_rate(sc, &hw->conf);
+       ath_update_txpow(sc);
+       ath9k_hw_set_interrupts(ah, sc->sc_imask);
+       ath9k_ps_restore(sc);
+       return 0;
+}
+
+/*
+ *  This routine performs the periodic noise floor calibration function
+ *  that is used to adjust and optimize the chip performance.  This
+ *  takes environmental changes (location, temperature) into account.
+ *  When the task is complete, it reschedules itself depending on the
+ *  appropriate interval that was calculated.
+ */
+static void ath_ani_calibrate(unsigned long data)
+{
+       struct ath_softc *sc;
+       struct ath_hal *ah;
+       bool longcal = false;
+       bool shortcal = false;
+       bool aniflag = false;
+       unsigned int timestamp = jiffies_to_msecs(jiffies);
+       u32 cal_interval;
+
+       sc = (struct ath_softc *)data;
+       ah = sc->sc_ah;
+
+       /*
+       * don't calibrate when we're scanning.
+       * we are most likely not on our home channel.
+       */
+       if (sc->rx.rxfilter & FIF_BCN_PRBRESP_PROMISC)
+               return;
+
+       /* Long calibration runs independently of short calibration. */
+       if ((timestamp - sc->sc_ani.sc_longcal_timer) >= ATH_LONG_CALINTERVAL) {
+               longcal = true;
+               DPRINTF(sc, ATH_DBG_ANI, "longcal @%lu\n", jiffies);
+               sc->sc_ani.sc_longcal_timer = timestamp;
+       }
+
+       /* Short calibration applies only while sc_caldone is false */
+       if (!sc->sc_ani.sc_caldone) {
+               if ((timestamp - sc->sc_ani.sc_shortcal_timer) >=
+                   ATH_SHORT_CALINTERVAL) {
+                       shortcal = true;
+                       DPRINTF(sc, ATH_DBG_ANI, "shortcal @%lu\n", jiffies);
+                       sc->sc_ani.sc_shortcal_timer = timestamp;
+                       sc->sc_ani.sc_resetcal_timer = timestamp;
+               }
+       } else {
+               if ((timestamp - sc->sc_ani.sc_resetcal_timer) >=
+                   ATH_RESTART_CALINTERVAL) {
+                       sc->sc_ani.sc_caldone = ath9k_hw_reset_calvalid(ah);
+                       if (sc->sc_ani.sc_caldone)
+                               sc->sc_ani.sc_resetcal_timer = timestamp;
+               }
+       }
+
+       /* Verify whether we must check ANI */
+       if ((timestamp - sc->sc_ani.sc_checkani_timer) >=
+          ATH_ANI_POLLINTERVAL) {
+               aniflag = true;
+               sc->sc_ani.sc_checkani_timer = timestamp;
+       }
+
+       /* Skip all processing if there's nothing to do. */
+       if (longcal || shortcal || aniflag) {
+               /* Call ANI routine if necessary */
+               if (aniflag)
+                       ath9k_hw_ani_monitor(ah, &sc->sc_halstats,
+                                            ah->ah_curchan);
+
+               /* Perform calibration if necessary */
+               if (longcal || shortcal) {
+                       bool iscaldone = false;
+
+                       if (ath9k_hw_calibrate(ah, ah->ah_curchan,
+                                              sc->sc_rx_chainmask, longcal,
+                                              &iscaldone)) {
+                               if (longcal)
+                                       sc->sc_ani.sc_noise_floor =
+                                               ath9k_hw_getchan_noise(ah,
+                                                              ah->ah_curchan);
+
+                               DPRINTF(sc, ATH_DBG_ANI,
+                                       "calibrate chan %u/%x nf: %d\n",
+                                       ah->ah_curchan->channel,
+                                       ah->ah_curchan->channelFlags,
+                                       sc->sc_ani.sc_noise_floor);
+                       } else {
+                               DPRINTF(sc, ATH_DBG_ANY,
+                                       "calibrate chan %u/%x failed\n",
+                                       ah->ah_curchan->channel,
+                                       ah->ah_curchan->channelFlags);
+                       }
+                       sc->sc_ani.sc_caldone = iscaldone;
+               }
+       }
+
+       /*
+       * Set timer interval based on previous results.
+       * The interval must be the shortest necessary to satisfy ANI,
+       * short calibration and long calibration.
+       */
+       cal_interval = ATH_LONG_CALINTERVAL;
+       if (sc->sc_ah->ah_config.enable_ani)
+               cal_interval = min(cal_interval, (u32)ATH_ANI_POLLINTERVAL);
+       if (!sc->sc_ani.sc_caldone)
+               cal_interval = min(cal_interval, (u32)ATH_SHORT_CALINTERVAL);
+
+       mod_timer(&sc->sc_ani.timer, jiffies + msecs_to_jiffies(cal_interval));
+}
+
+/*
+ * Update tx/rx chainmask. For legacy association,
+ * hard code chainmask to 1x1, for 11n association, use
+ * the chainmask configuration, for bt coexistence, use
+ * the chainmask configuration even in legacy mode.
+ */
+static void ath_update_chainmask(struct ath_softc *sc, int is_ht)
+{
+       sc->sc_flags |= SC_OP_CHAINMASK_UPDATE;
+       if (is_ht ||
+           (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_BT_COEX)) {
+               sc->sc_tx_chainmask = sc->sc_ah->ah_caps.tx_chainmask;
+               sc->sc_rx_chainmask = sc->sc_ah->ah_caps.rx_chainmask;
+       } else {
+               sc->sc_tx_chainmask = 1;
+               sc->sc_rx_chainmask = 1;
+       }
+
+       DPRINTF(sc, ATH_DBG_CONFIG, "tx chmask: %d, rx chmask: %d\n",
+               sc->sc_tx_chainmask, sc->sc_rx_chainmask);
+}
+
+static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)
+{
+       struct ath_node *an;
+
+       an = (struct ath_node *)sta->drv_priv;
+
+       if (sc->sc_flags & SC_OP_TXAGGR)
+               ath_tx_node_init(sc, an);
+
+       an->maxampdu = 1 << (IEEE80211_HTCAP_MAXRXAMPDU_FACTOR +
+                            sta->ht_cap.ampdu_factor);
+       an->mpdudensity = parse_mpdudensity(sta->ht_cap.ampdu_density);
+}
+
+static void ath_node_detach(struct ath_softc *sc, struct ieee80211_sta *sta)
+{
+       struct ath_node *an = (struct ath_node *)sta->drv_priv;
+
+       if (sc->sc_flags & SC_OP_TXAGGR)
+               ath_tx_node_cleanup(sc, an);
+}
+
+static void ath9k_tasklet(unsigned long data)
+{
+       struct ath_softc *sc = (struct ath_softc *)data;
+       u32 status = sc->sc_intrstatus;
+
+       if (status & ATH9K_INT_FATAL) {
+               /* need a chip reset */
+               ath_reset(sc, false);
+               return;
+       } else {
 
-static void ath_detach(struct ath_softc *sc);
+               if (status &
+                   (ATH9K_INT_RX | ATH9K_INT_RXEOL | ATH9K_INT_RXORN)) {
+                       spin_lock_bh(&sc->rx.rxflushlock);
+                       ath_rx_tasklet(sc, 0);
+                       spin_unlock_bh(&sc->rx.rxflushlock);
+               }
+               /* XXX: optimize this */
+               if (status & ATH9K_INT_TX)
+                       ath_tx_tasklet(sc);
+       }
+
+       /* re-enable hardware interrupt */
+       ath9k_hw_set_interrupts(sc->sc_ah, sc->sc_imask);
+}
+
+irqreturn_t ath_isr(int irq, void *dev)
+{
+       struct ath_softc *sc = dev;
+       struct ath_hal *ah = sc->sc_ah;
+       enum ath9k_int status;
+       bool sched = false;
+
+       do {
+               if (sc->sc_flags & SC_OP_INVALID) {
+                       /*
+                        * The hardware is not ready/present, don't
+                        * touch anything. Note this can happen early
+                        * on if the IRQ is shared.
+                        */
+                       return IRQ_NONE;
+               }
+               if (!ath9k_hw_intrpend(ah)) {   /* shared irq, not for us */
+                       return IRQ_NONE;
+               }
+
+               /*
+                * Figure out the reason(s) for the interrupt.  Note
+                * that the hal returns a pseudo-ISR that may include
+                * bits we haven't explicitly enabled so we mask the
+                * value to insure we only process bits we requested.
+                */
+               ath9k_hw_getisr(ah, &status);   /* NB: clears ISR too */
+
+               status &= sc->sc_imask; /* discard unasked-for bits */
+
+               /*
+                * If there are no status bits set, then this interrupt was not
+                * for me (should have been caught above).
+                */
+               if (!status)
+                       return IRQ_NONE;
+
+               sc->sc_intrstatus = status;
+
+               if (status & ATH9K_INT_FATAL) {
+                       /* need a chip reset */
+                       sched = true;
+               } else if (status & ATH9K_INT_RXORN) {
+                       /* need a chip reset */
+                       sched = true;
+               } else {
+                       if (status & ATH9K_INT_SWBA) {
+                               /* schedule a tasklet for beacon handling */
+                               tasklet_schedule(&sc->bcon_tasklet);
+                       }
+                       if (status & ATH9K_INT_RXEOL) {
+                               /*
+                                * NB: the hardware should re-read the link when
+                                *     RXE bit is written, but it doesn't work
+                                *     at least on older hardware revs.
+                                */
+                               sched = true;
+                       }
+
+                       if (status & ATH9K_INT_TXURN)
+                               /* bump tx trigger level */
+                               ath9k_hw_updatetxtriglevel(ah, true);
+                       /* XXX: optimize this */
+                       if (status & ATH9K_INT_RX)
+                               sched = true;
+                       if (status & ATH9K_INT_TX)
+                               sched = true;
+                       if (status & ATH9K_INT_BMISS)
+                               sched = true;
+                       /* carrier sense timeout */
+                       if (status & ATH9K_INT_CST)
+                               sched = true;
+                       if (status & ATH9K_INT_MIB) {
+                               /*
+                                * Disable interrupts until we service the MIB
+                                * interrupt; otherwise it will continue to
+                                * fire.
+                                */
+                               ath9k_hw_set_interrupts(ah, 0);
+                               /*
+                                * Let the hal handle the event. We assume
+                                * it will clear whatever condition caused
+                                * the interrupt.
+                                */
+                               ath9k_hw_procmibevent(ah, &sc->sc_halstats);
+                               ath9k_hw_set_interrupts(ah, sc->sc_imask);
+                       }
+                       if (status & ATH9K_INT_TIM_TIMER) {
+                               if (!(ah->ah_caps.hw_caps &
+                                     ATH9K_HW_CAP_AUTOSLEEP)) {
+                                       /* Clear RxAbort bit so that we can
+                                        * receive frames */
+                                       ath9k_hw_setpower(ah, ATH9K_PM_AWAKE);
+                                       ath9k_hw_setrxabort(ah, 0);
+                                       sched = true;
+                                       sc->sc_flags |= SC_OP_WAIT_FOR_BEACON;
+                               }
+                       }
+               }
+       } while (0);
+
+       ath_debug_stat_interrupt(sc, status);
+
+       if (sched) {
+               /* turn off every interrupt except SWBA */
+               ath9k_hw_set_interrupts(ah, (sc->sc_imask & ATH9K_INT_SWBA));
+               tasklet_schedule(&sc->intr_tq);
+       }
+
+       return IRQ_HANDLED;
+}
 
 static int ath_get_channel(struct ath_softc *sc,
                           struct ieee80211_channel *chan)
@@ -54,34 +596,39 @@ static int ath_get_channel(struct ath_softc *sc,
 }
 
 static u32 ath_get_extchanmode(struct ath_softc *sc,
-                                    struct ieee80211_channel *chan)
+                              struct ieee80211_channel *chan,
+                              enum nl80211_channel_type channel_type)
 {
        u32 chanmode = 0;
-       u8 ext_chan_offset = sc->sc_ht_info.ext_chan_offset;
-       enum ath9k_ht_macmode tx_chan_width = sc->sc_ht_info.tx_chan_width;
 
        switch (chan->band) {
        case IEEE80211_BAND_2GHZ:
-               if ((ext_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_NONE) &&
-                   (tx_chan_width == ATH9K_HT_MACMODE_20))
+               switch(channel_type) {
+               case NL80211_CHAN_NO_HT:
+               case NL80211_CHAN_HT20:
                        chanmode = CHANNEL_G_HT20;
-               if ((ext_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE) &&
-                   (tx_chan_width == ATH9K_HT_MACMODE_2040))
+                       break;
+               case NL80211_CHAN_HT40PLUS:
                        chanmode = CHANNEL_G_HT40PLUS;
-               if ((ext_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW) &&
-                   (tx_chan_width == ATH9K_HT_MACMODE_2040))
+                       break;
+               case NL80211_CHAN_HT40MINUS:
                        chanmode = CHANNEL_G_HT40MINUS;
+                       break;
+               }
                break;
        case IEEE80211_BAND_5GHZ:
-               if ((ext_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_NONE) &&
-                   (tx_chan_width == ATH9K_HT_MACMODE_20))
+               switch(channel_type) {
+               case NL80211_CHAN_NO_HT:
+               case NL80211_CHAN_HT20:
                        chanmode = CHANNEL_A_HT20;
-               if ((ext_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE) &&
-                   (tx_chan_width == ATH9K_HT_MACMODE_2040))
+                       break;
+               case NL80211_CHAN_HT40PLUS:
                        chanmode = CHANNEL_A_HT40PLUS;
-               if ((ext_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW) &&
-                   (tx_chan_width == ATH9K_HT_MACMODE_2040))
+                       break;
+               case NL80211_CHAN_HT40MINUS:
                        chanmode = CHANNEL_A_HT40MINUS;
+                       break;
+               }
                break;
        default:
                break;
@@ -90,22 +637,31 @@ static u32 ath_get_extchanmode(struct ath_softc *sc,
        return chanmode;
 }
 
+static int ath_keyset(struct ath_softc *sc, u16 keyix,
+              struct ath9k_keyval *hk, const u8 mac[ETH_ALEN])
+{
+       bool status;
+
+       status = ath9k_hw_set_keycache_entry(sc->sc_ah,
+               keyix, hk, mac, false);
 
-static int ath_setkey_tkip(struct ath_softc *sc,
-                          struct ieee80211_key_conf *key,
+       return status != false;
+}
+
+static int ath_setkey_tkip(struct ath_softc *sc, u16 keyix, const u8 *key,
                           struct ath9k_keyval *hk,
                           const u8 *addr)
 {
-       u8 *key_rxmic = NULL;
-       u8 *key_txmic = NULL;
+       const u8 *key_rxmic;
+       const u8 *key_txmic;
 
-       key_txmic = key->key + NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY;
-       key_rxmic = key->key + NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY;
+       key_txmic = key + NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY;
+       key_rxmic = key + NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY;
 
        if (addr == NULL) {
                /* Group key installation */
-               memcpy(hk->kv_mic,  key_rxmic, sizeof(hk->kv_mic));
-               return ath_keyset(sc, key->keyidx, hk, addr);
+               memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
+               return ath_keyset(sc, keyix, hk, addr);
        }
        if (!sc->sc_splitmic) {
                /*
@@ -114,34 +670,113 @@ static int ath_setkey_tkip(struct ath_softc *sc,
                 */
                memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
                memcpy(hk->kv_txmic, key_txmic, sizeof(hk->kv_txmic));
-               return ath_keyset(sc, key->keyidx, hk, addr);
+               return ath_keyset(sc, keyix, hk, addr);
        }
        /*
         * TX key goes at first index, RX key at +32.
         * The hal handles the MIC keys at index+64.
         */
        memcpy(hk->kv_mic, key_txmic, sizeof(hk->kv_mic));
-       if (!ath_keyset(sc, key->keyidx, hk, NULL)) {
+       if (!ath_keyset(sc, keyix, hk, NULL)) {
                /* Txmic entry failed. No need to proceed further */
                DPRINTF(sc, ATH_DBG_KEYCACHE,
-                       "%s Setting TX MIC Key Failed\n", __func__);
+                       "Setting TX MIC Key Failed\n");
                return 0;
        }
 
        memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
        /* XXX delete tx key on failure? */
-       return ath_keyset(sc, key->keyidx+32, hk, addr);
+       return ath_keyset(sc, keyix + 32, hk, addr);
+}
+
+static int ath_reserve_key_cache_slot_tkip(struct ath_softc *sc)
+{
+       int i;
+
+       for (i = IEEE80211_WEP_NKID; i < sc->sc_keymax / 2; i++) {
+               if (test_bit(i, sc->sc_keymap) ||
+                   test_bit(i + 64, sc->sc_keymap))
+                       continue; /* At least one part of TKIP key allocated */
+               if (sc->sc_splitmic &&
+                   (test_bit(i + 32, sc->sc_keymap) ||
+                    test_bit(i + 64 + 32, sc->sc_keymap)))
+                       continue; /* At least one part of TKIP key allocated */
+
+               /* Found a free slot for a TKIP key */
+               return i;
+       }
+       return -1;
+}
+
+static int ath_reserve_key_cache_slot(struct ath_softc *sc)
+{
+       int i;
+
+       /* First, try to find slots that would not be available for TKIP. */
+       if (sc->sc_splitmic) {
+               for (i = IEEE80211_WEP_NKID; i < sc->sc_keymax / 4; i++) {
+                       if (!test_bit(i, sc->sc_keymap) &&
+                           (test_bit(i + 32, sc->sc_keymap) ||
+                            test_bit(i + 64, sc->sc_keymap) ||
+                            test_bit(i + 64 + 32, sc->sc_keymap)))
+                               return i;
+                       if (!test_bit(i + 32, sc->sc_keymap) &&
+                           (test_bit(i, sc->sc_keymap) ||
+                            test_bit(i + 64, sc->sc_keymap) ||
+                            test_bit(i + 64 + 32, sc->sc_keymap)))
+                               return i + 32;
+                       if (!test_bit(i + 64, sc->sc_keymap) &&
+                           (test_bit(i , sc->sc_keymap) ||
+                            test_bit(i + 32, sc->sc_keymap) ||
+                            test_bit(i + 64 + 32, sc->sc_keymap)))
+                               return i + 64;
+                       if (!test_bit(i + 64 + 32, sc->sc_keymap) &&
+                           (test_bit(i, sc->sc_keymap) ||
+                            test_bit(i + 32, sc->sc_keymap) ||
+                            test_bit(i + 64, sc->sc_keymap)))
+                               return i + 64 + 32;
+               }
+       } else {
+               for (i = IEEE80211_WEP_NKID; i < sc->sc_keymax / 2; i++) {
+                       if (!test_bit(i, sc->sc_keymap) &&
+                           test_bit(i + 64, sc->sc_keymap))
+                               return i;
+                       if (test_bit(i, sc->sc_keymap) &&
+                           !test_bit(i + 64, sc->sc_keymap))
+                               return i + 64;
+               }
+       }
+
+       /* No partially used TKIP slots, pick any available slot */
+       for (i = IEEE80211_WEP_NKID; i < sc->sc_keymax; i++) {
+               /* Do not allow slots that could be needed for TKIP group keys
+                * to be used. This limitation could be removed if we know that
+                * TKIP will not be used. */
+               if (i >= 64 && i < 64 + IEEE80211_WEP_NKID)
+                       continue;
+               if (sc->sc_splitmic) {
+                       if (i >= 32 && i < 32 + IEEE80211_WEP_NKID)
+                               continue;
+                       if (i >= 64 + 32 && i < 64 + 32 + IEEE80211_WEP_NKID)
+                               continue;
+               }
+
+               if (!test_bit(i, sc->sc_keymap))
+                       return i; /* Found a free slot for a key */
+       }
+
+       /* No free slot found */
+       return -1;
 }
 
 static int ath_key_config(struct ath_softc *sc,
-                         const u8 *addr,
+                         struct ieee80211_sta *sta,
                          struct ieee80211_key_conf *key)
 {
-       struct ieee80211_vif *vif;
        struct ath9k_keyval hk;
        const u8 *mac = NULL;
        int ret = 0;
-       enum nl80211_iftype opmode;
+       int idx;
 
        memset(&hk, 0, sizeof(hk));
 
@@ -156,64 +791,78 @@ static int ath_key_config(struct ath_softc *sc,
                hk.kv_type = ATH9K_CIPHER_AES_CCM;
                break;
        default:
-               return -EINVAL;
+               return -EOPNOTSUPP;
        }
 
-       hk.kv_len  = key->keylen;
+       hk.kv_len = key->keylen;
        memcpy(hk.kv_val, key->key, key->keylen);
 
-       if (!sc->sc_vaps[0])
-               return -EIO;
-
-       vif = sc->sc_vaps[0];
-       opmode = vif->type;
-
-       /*
-        *  Strategy:
-        *   For _M_STA mc tx, we will not setup a key at all since we never
-        *   tx mc.
-        *   _M_STA mc rx, we will use the keyID.
-        *   for _M_IBSS mc tx, we will use the keyID, and no macaddr.
-        *   for _M_IBSS mc rx, we will alloc a slot and plumb the mac of the
-        *   peer node. BUT we will plumb a cleartext key so that we can do
-        *   perSta default key table lookup in software.
-        */
-       if (is_broadcast_ether_addr(addr)) {
-               switch (opmode) {
-               case NL80211_IFTYPE_STATION:
-                       /* default key:  could be group WPA key
-                        * or could be static WEP key */
-                       mac = NULL;
-                       break;
-               case NL80211_IFTYPE_ADHOC:
-                       break;
-               case NL80211_IFTYPE_AP:
-                       break;
-               default:
-                       ASSERT(0);
-                       break;
-               }
+       if (!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
+               /* For now, use the default keys for broadcast keys. This may
+                * need to change with virtual interfaces. */
+               idx = key->keyidx;
+       } else if (key->keyidx) {
+               struct ieee80211_vif *vif;
+
+               if (WARN_ON(!sta))
+                       return -EOPNOTSUPP;
+               mac = sta->addr;
+
+               vif = sc->sc_vaps[0];
+               if (vif->type != NL80211_IFTYPE_AP) {
+                       /* Only keyidx 0 should be used with unicast key, but
+                        * allow this for client mode for now. */
+                       idx = key->keyidx;
+               } else
+                       return -EIO;
        } else {
-               mac = addr;
+               if (WARN_ON(!sta))
+                       return -EOPNOTSUPP;
+               mac = sta->addr;
+
+               if (key->alg == ALG_TKIP)
+                       idx = ath_reserve_key_cache_slot_tkip(sc);
+               else
+                       idx = ath_reserve_key_cache_slot(sc);
+               if (idx < 0)
+                       return -ENOSPC; /* no free key cache entries */
        }
 
        if (key->alg == ALG_TKIP)
-               ret = ath_setkey_tkip(sc, key, &hk, mac);
+               ret = ath_setkey_tkip(sc, idx, key->key, &hk, mac);
        else
-               ret = ath_keyset(sc, key->keyidx, &hk, mac);
+               ret = ath_keyset(sc, idx, &hk, mac);
 
        if (!ret)
                return -EIO;
 
-       return 0;
+       set_bit(idx, sc->sc_keymap);
+       if (key->alg == ALG_TKIP) {
+               set_bit(idx + 64, sc->sc_keymap);
+               if (sc->sc_splitmic) {
+                       set_bit(idx + 32, sc->sc_keymap);
+                       set_bit(idx + 64 + 32, sc->sc_keymap);
+               }
+       }
+
+       return idx;
 }
 
 static void ath_key_delete(struct ath_softc *sc, struct ieee80211_key_conf *key)
 {
-       int freeslot;
+       ath9k_hw_keyreset(sc->sc_ah, key->hw_key_idx);
+       if (key->hw_key_idx < IEEE80211_WEP_NKID)
+               return;
+
+       clear_bit(key->hw_key_idx, sc->sc_keymap);
+       if (key->alg != ALG_TKIP)
+               return;
 
-       freeslot = (key->keyidx >= 4) ? 1 : 0;
-       ath_key_reset(sc, key->keyidx, freeslot);
+       clear_bit(key->hw_key_idx + 64, sc->sc_keymap);
+       if (sc->sc_splitmic) {
+               clear_bit(key->hw_key_idx + 32, sc->sc_keymap);
+               clear_bit(key->hw_key_idx + 64 + 32, sc->sc_keymap);
+       }
 }
 
 static void setup_ht_cap(struct ieee80211_sta_ht_cap *ht_info)
@@ -236,101 +885,18 @@ static void setup_ht_cap(struct ieee80211_sta_ht_cap *ht_info)
        ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
 }
 
-static int ath_rate2idx(struct ath_softc *sc, int rate)
-{
-       int i = 0, cur_band, n_rates;
-       struct ieee80211_hw *hw = sc->hw;
-
-       cur_band = hw->conf.channel->band;
-       n_rates = sc->sbands[cur_band].n_bitrates;
-
-       for (i = 0; i < n_rates; i++) {
-               if (sc->sbands[cur_band].bitrates[i].bitrate == rate)
-                       break;
-       }
-
-       /*
-        * NB:mac80211 validates rx rate index against the supported legacy rate
-        * index only (should be done against ht rates also), return the highest
-        * legacy rate index for rx rate which does not match any one of the
-        * supported basic and extended rates to make mac80211 happy.
-        * The following hack will be cleaned up once the issue with
-        * the rx rate index validation in mac80211 is fixed.
-        */
-       if (i == n_rates)
-               return n_rates - 1;
-       return i;
-}
-
-static void ath9k_rx_prepare(struct ath_softc *sc,
-                            struct sk_buff *skb,
-                            struct ath_recv_status *status,
-                            struct ieee80211_rx_status *rx_status)
-{
-       struct ieee80211_hw *hw = sc->hw;
-       struct ieee80211_channel *curchan = hw->conf.channel;
-
-       memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
-
-       rx_status->mactime = status->tsf;
-       rx_status->band = curchan->band;
-       rx_status->freq =  curchan->center_freq;
-       rx_status->noise = sc->sc_ani.sc_noise_floor;
-       rx_status->signal = rx_status->noise + status->rssi;
-       rx_status->rate_idx = ath_rate2idx(sc, (status->rateKbps / 100));
-       rx_status->antenna = status->antenna;
-
-       /* at 45 you will be able to use MCS 15 reliably. A more elaborate
-        * scheme can be used here but it requires tables of SNR/throughput for
-        * each possible mode used. */
-       rx_status->qual = status->rssi * 100 / 45;
-
-       /* rssi can be more than 45 though, anything above that
-        * should be considered at 100% */
-       if (rx_status->qual > 100)
-               rx_status->qual = 100;
-
-       if (status->flags & ATH_RX_MIC_ERROR)
-               rx_status->flag |= RX_FLAG_MMIC_ERROR;
-       if (status->flags & ATH_RX_FCS_ERROR)
-               rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
-
-       rx_status->flag |= RX_FLAG_TSFT;
-}
-
-static void ath9k_ht_conf(struct ath_softc *sc,
-                         struct ieee80211_bss_conf *bss_conf)
-{
-       struct ath_ht_info *ht_info = &sc->sc_ht_info;
-
-       if (sc->hw->conf.ht.enabled) {
-               ht_info->ext_chan_offset = bss_conf->ht.secondary_channel_offset;
-
-               if (bss_conf->ht.width_40_ok)
-                       ht_info->tx_chan_width = ATH9K_HT_MACMODE_2040;
-               else
-                       ht_info->tx_chan_width = ATH9K_HT_MACMODE_20;
-
-               ath9k_hw_set11nmac2040(sc->sc_ah, ht_info->tx_chan_width);
-       }
-}
-
 static void ath9k_bss_assoc_info(struct ath_softc *sc,
                                 struct ieee80211_vif *vif,
                                 struct ieee80211_bss_conf *bss_conf)
 {
-       struct ieee80211_hw *hw = sc->hw;
-       struct ieee80211_channel *curchan = hw->conf.channel;
        struct ath_vap *avp = (void *)vif->drv_priv;
-       int pos;
 
        if (bss_conf->assoc) {
-               DPRINTF(sc, ATH_DBG_CONFIG, "%s: Bss Info ASSOC %d\n",
-                       __func__,
-                       bss_conf->aid);
+               DPRINTF(sc, ATH_DBG_CONFIG, "Bss Info ASSOC %d, bssid: %pM\n",
+                       bss_conf->aid, sc->sc_curbssid);
 
                /* New association, store aid */
-               if (avp->av_opmode == ATH9K_M_STA) {
+               if (avp->av_opmode == NL80211_IFTYPE_STATION) {
                        sc->sc_curaid = bss_conf->aid;
                        ath9k_hw_write_associd(sc->sc_ah, sc->sc_curbssid,
                                               sc->sc_curaid);
@@ -346,139 +912,16 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc,
                sc->sc_halstats.ns_avgtxrssi = ATH_RSSI_DUMMY_MARKER;
                sc->sc_halstats.ns_avgtxrate = ATH_RATE_DUMMY_MARKER;
 
-               /* Update chainmask */
-               ath_update_chainmask(sc, hw->conf.ht.enabled);
-
-               DPRINTF(sc, ATH_DBG_CONFIG,
-                       "%s: bssid %pM aid 0x%x\n",
-                       __func__,
-                       sc->sc_curbssid, sc->sc_curaid);
-
-               DPRINTF(sc, ATH_DBG_CONFIG, "%s: Set channel: %d MHz\n",
-                       __func__,
-                       curchan->center_freq);
-
-               pos = ath_get_channel(sc, curchan);
-               if (pos == -1) {
-                       DPRINTF(sc, ATH_DBG_FATAL,
-                               "%s: Invalid channel\n", __func__);
-                       return;
-               }
-
-               if (hw->conf.ht.enabled)
-                       sc->sc_ah->ah_channels[pos].chanmode =
-                               ath_get_extchanmode(sc, curchan);
-               else
-                       sc->sc_ah->ah_channels[pos].chanmode =
-                               (curchan->band == IEEE80211_BAND_2GHZ) ?
-                               CHANNEL_G : CHANNEL_A;
-
-               /* set h/w channel */
-               if (ath_set_channel(sc, &sc->sc_ah->ah_channels[pos]) < 0)
-                       DPRINTF(sc, ATH_DBG_FATAL,
-                               "%s: Unable to set channel\n",
-                               __func__);
-
-               ath_rate_newstate(sc, avp);
-               /* Update ratectrl about the new state */
-               ath_rc_node_update(hw, avp->rc_node);
-
                /* Start ANI */
                mod_timer(&sc->sc_ani.timer,
                        jiffies + msecs_to_jiffies(ATH_ANI_POLLINTERVAL));
 
        } else {
-               DPRINTF(sc, ATH_DBG_CONFIG,
-               "%s: Bss Info DISSOC\n", __func__);
+               DPRINTF(sc, ATH_DBG_CONFIG, "Bss Info DISSOC\n");
                sc->sc_curaid = 0;
        }
 }
 
-void ath_get_beaconconfig(struct ath_softc *sc,
-                         int if_id,
-                         struct ath_beacon_config *conf)
-{
-       struct ieee80211_hw *hw = sc->hw;
-
-       /* fill in beacon config data */
-
-       conf->beacon_interval = hw->conf.beacon_int;
-       conf->listen_interval = 100;
-       conf->dtim_count = 1;
-       conf->bmiss_timeout = ATH_DEFAULT_BMISS_LIMIT * conf->listen_interval;
-}
-
-void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
-                    struct ath_xmit_status *tx_status)
-{
-       struct ieee80211_hw *hw = sc->hw;
-       struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
-
-       DPRINTF(sc, ATH_DBG_XMIT,
-               "%s: TX complete: skb: %p\n", __func__, skb);
-
-       ieee80211_tx_info_clear_status(tx_info);
-       if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK ||
-               tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED) {
-               /* free driver's private data area of tx_info, XXX: HACK! */
-               if (tx_info->control.vif != NULL)
-                       kfree(tx_info->control.vif);
-                       tx_info->control.vif = NULL;
-       }
-
-       if (tx_status->flags & ATH_TX_BAR) {
-               tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
-               tx_status->flags &= ~ATH_TX_BAR;
-       }
-
-       if (!(tx_status->flags & (ATH_TX_ERROR | ATH_TX_XRETRY))) {
-               /* Frame was ACKed */
-               tx_info->flags |= IEEE80211_TX_STAT_ACK;
-       }
-
-       tx_info->status.rates[0].count = tx_status->retries + 1;
-
-       ieee80211_tx_status(hw, skb);
-}
-
-int _ath_rx_indicate(struct ath_softc *sc,
-                    struct sk_buff *skb,
-                    struct ath_recv_status *status,
-                    u16 keyix)
-{
-       struct ieee80211_hw *hw = sc->hw;
-       struct ieee80211_rx_status rx_status;
-       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
-       int hdrlen = ieee80211_get_hdrlen_from_skb(skb);
-       int padsize;
-
-       /* see if any padding is done by the hw and remove it */
-       if (hdrlen & 3) {
-               padsize = hdrlen % 4;
-               memmove(skb->data + padsize, skb->data, hdrlen);
-               skb_pull(skb, padsize);
-       }
-
-       /* Prepare rx status */
-       ath9k_rx_prepare(sc, skb, status, &rx_status);
-
-       if (!(keyix == ATH9K_RXKEYIX_INVALID) &&
-           !(status->flags & ATH_RX_DECRYPT_ERROR)) {
-               rx_status.flag |= RX_FLAG_DECRYPTED;
-       } else if ((le16_to_cpu(hdr->frame_control) & IEEE80211_FCTL_PROTECTED)
-                  && !(status->flags & ATH_RX_DECRYPT_ERROR)
-                  && skb->len >= hdrlen + 4) {
-               keyix = skb->data[hdrlen + 3] >> 6;
-
-               if (test_bit(keyix, sc->sc_keymap))
-                       rx_status.flag |= RX_FLAG_DECRYPTED;
-       }
-
-       __ieee80211_rx(hw, skb, &rx_status);
-
-       return 0;
-}
-
 /********************************/
 /*      LED functions          */
 /********************************/
@@ -594,7 +1037,7 @@ fail:
        ath_deinit_leds(sc);
 }
 
-#ifdef CONFIG_RFKILL
+#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
 
 /*******************/
 /*     Rfkill     */
@@ -603,30 +1046,26 @@ fail:
 static void ath_radio_enable(struct ath_softc *sc)
 {
        struct ath_hal *ah = sc->sc_ah;
-       int status;
+       struct ieee80211_channel *channel = sc->hw->conf.channel;
+       int r;
 
+       ath9k_ps_wakeup(sc);
        spin_lock_bh(&sc->sc_resetlock);
-       if (!ath9k_hw_reset(ah, ah->ah_curchan,
-                           sc->sc_ht_info.tx_chan_width,
-                           sc->sc_tx_chainmask,
-                           sc->sc_rx_chainmask,
-                           sc->sc_ht_extprotspacing,
-                           false, &status)) {
+
+       r = ath9k_hw_reset(ah, ah->ah_curchan, false);
+
+       if (r) {
                DPRINTF(sc, ATH_DBG_FATAL,
-                       "%s: unable to reset channel %u (%uMhz) "
-                       "flags 0x%x hal status %u\n", __func__,
-                       ath9k_hw_mhz2ieee(ah,
-                                         ah->ah_curchan->channel,
-                                         ah->ah_curchan->channelFlags),
-                       ah->ah_curchan->channel,
-                       ah->ah_curchan->channelFlags, status);
+                       "Unable to reset channel %u (%uMhz) ",
+                       "reset status %u\n",
+                       channel->center_freq, r);
        }
        spin_unlock_bh(&sc->sc_resetlock);
 
        ath_update_txpow(sc);
        if (ath_startrecv(sc) != 0) {
                DPRINTF(sc, ATH_DBG_FATAL,
-                       "%s: unable to restart recv logic\n", __func__);
+                       "Unable to restart recv logic\n");
                return;
        }
 
@@ -642,14 +1081,16 @@ static void ath_radio_enable(struct ath_softc *sc)
        ath9k_hw_set_gpio(ah, ATH_LED_PIN, 0);
 
        ieee80211_wake_queues(sc->hw);
+       ath9k_ps_restore(sc);
 }
 
 static void ath_radio_disable(struct ath_softc *sc)
 {
        struct ath_hal *ah = sc->sc_ah;
-       int status;
-
+       struct ieee80211_channel *channel = sc->hw->conf.channel;
+       int r;
 
+       ath9k_ps_wakeup(sc);
        ieee80211_stop_queues(sc->hw);
 
        /* Disable LED */
@@ -659,30 +1100,23 @@ static void ath_radio_disable(struct ath_softc *sc)
        /* Disable interrupts */
        ath9k_hw_set_interrupts(ah, 0);
 
-       ath_draintxq(sc, false);        /* clear pending tx frames */
+       ath_drain_all_txq(sc, false);   /* clear pending tx frames */
        ath_stoprecv(sc);               /* turn off frame recv */
        ath_flushrecv(sc);              /* flush recv queue */
 
        spin_lock_bh(&sc->sc_resetlock);
-       if (!ath9k_hw_reset(ah, ah->ah_curchan,
-                           sc->sc_ht_info.tx_chan_width,
-                           sc->sc_tx_chainmask,
-                           sc->sc_rx_chainmask,
-                           sc->sc_ht_extprotspacing,
-                           false, &status)) {
+       r = ath9k_hw_reset(ah, ah->ah_curchan, false);
+       if (r) {
                DPRINTF(sc, ATH_DBG_FATAL,
-                       "%s: unable to reset channel %u (%uMhz) "
-                       "flags 0x%x hal status %u\n", __func__,
-                       ath9k_hw_mhz2ieee(ah,
-                               ah->ah_curchan->channel,
-                               ah->ah_curchan->channelFlags),
-                       ah->ah_curchan->channel,
-                       ah->ah_curchan->channelFlags, status);
+                       "Unable to reset channel %u (%uMhz) "
+                       "reset status %u\n",
+                       channel->center_freq, r);
        }
        spin_unlock_bh(&sc->sc_resetlock);
 
        ath9k_hw_phy_disable(ah);
        ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP);
+       ath9k_ps_restore(sc);
 }
 
 static bool ath_is_rfkill_set(struct ath_softc *sc)
@@ -752,7 +1186,7 @@ static int ath_sw_toggle_radio(void *data, enum rfkill_state state)
                        sc->sc_flags &= ~SC_OP_RFKILL_SW_BLOCKED;
                        if (sc->sc_flags & SC_OP_RFKILL_HW_BLOCKED) {
                                DPRINTF(sc, ATH_DBG_FATAL, "Can't turn on the"
-                                       "radio as it is disabled by h/w \n");
+                                       "radio as it is disabled by h/w\n");
                                return -EPERM;
                        }
                        ath_radio_enable(sc);
@@ -810,13 +1244,7 @@ static int ath_start_rfkill_poll(struct ath_softc *sc)
                        rfkill_free(sc->rf_kill.rfkill);
 
                        /* Deinitialize the device */
-                       if (sc->pdev->irq)
-                               free_irq(sc->pdev->irq, sc);
-                       ath_detach(sc);
-                       pci_iounmap(sc->pdev, sc->mem);
-                       pci_release_region(sc->pdev, 0);
-                       pci_disable_device(sc->pdev);
-                       ieee80211_free_hw(sc->hw);
+                       ath_cleanup(sc);
                        return -EIO;
                } else {
                        sc->sc_flags |= SC_OP_RFKILL_REGISTERED;
@@ -827,23 +1255,29 @@ static int ath_start_rfkill_poll(struct ath_softc *sc)
 }
 #endif /* CONFIG_RFKILL */
 
-static void ath_detach(struct ath_softc *sc)
+void ath_cleanup(struct ath_softc *sc)
+{
+       ath_detach(sc);
+       free_irq(sc->irq, sc);
+       ath_bus_cleanup(sc);
+       ieee80211_free_hw(sc->hw);
+}
+
+void ath_detach(struct ath_softc *sc)
 {
        struct ieee80211_hw *hw = sc->hw;
        int i = 0;
 
-       DPRINTF(sc, ATH_DBG_CONFIG, "%s: Detach ATH hw\n", __func__);
-
-       ieee80211_unregister_hw(hw);
+       ath9k_ps_wakeup(sc);
 
-       ath_deinit_leds(sc);
+       DPRINTF(sc, ATH_DBG_CONFIG, "Detach ATH hw\n");
 
-#ifdef CONFIG_RFKILL
+#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
        ath_deinit_rfkill(sc);
 #endif
-       ath_rate_control_unregister();
-       ath_rate_detach(sc->sc_rc);
+       ath_deinit_leds(sc);
 
+       ieee80211_unregister_hw(hw);
        ath_rx_cleanup(sc);
        ath_tx_cleanup(sc);
 
@@ -856,17 +1290,242 @@ static void ath_detach(struct ath_softc *sc)
        /* cleanup tx queues */
        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
                if (ATH_TXQ_SETUP(sc, i))
-                       ath_tx_cleanupq(sc, &sc->sc_txq[i]);
+                       ath_tx_cleanupq(sc, &sc->tx.txq[i]);
 
        ath9k_hw_detach(sc->sc_ah);
+       ath9k_exit_debug(sc);
+       ath9k_ps_restore(sc);
 }
 
-static int ath_attach(u16 devid, struct ath_softc *sc)
+static int ath_init(u16 devid, struct ath_softc *sc)
+{
+       struct ath_hal *ah = NULL;
+       int status;
+       int error = 0, i;
+       int csz = 0;
+
+       /* XXX: hardware will not be ready until ath_open() being called */
+       sc->sc_flags |= SC_OP_INVALID;
+
+       if (ath9k_init_debug(sc) < 0)
+               printk(KERN_ERR "Unable to create debugfs files\n");
+
+       spin_lock_init(&sc->sc_resetlock);
+       mutex_init(&sc->mutex);
+       tasklet_init(&sc->intr_tq, ath9k_tasklet, (unsigned long)sc);
+       tasklet_init(&sc->bcon_tasklet, ath9k_beacon_tasklet,
+                    (unsigned long)sc);
+
+       /*
+        * Cache line size is used to size and align various
+        * structures used to communicate with the hardware.
+        */
+       ath_read_cachesize(sc, &csz);
+       /* XXX assert csz is non-zero */
+       sc->sc_cachelsz = csz << 2;     /* convert to bytes */
+
+       ah = ath9k_hw_attach(devid, sc, sc->mem, &status);
+       if (ah == NULL) {
+               DPRINTF(sc, ATH_DBG_FATAL,
+                       "Unable to attach hardware; HAL status %d\n", status);
+               error = -ENXIO;
+               goto bad;
+       }
+       sc->sc_ah = ah;
+
+       /* Get the hardware key cache size. */
+       sc->sc_keymax = ah->ah_caps.keycache_size;
+       if (sc->sc_keymax > ATH_KEYMAX) {
+               DPRINTF(sc, ATH_DBG_KEYCACHE,
+                       "Warning, using only %u entries in %u key cache\n",
+                       ATH_KEYMAX, sc->sc_keymax);
+               sc->sc_keymax = ATH_KEYMAX;
+       }
+
+       /*
+        * Reset the key cache since some parts do not
+        * reset the contents on initial power up.
+        */
+       for (i = 0; i < sc->sc_keymax; i++)
+               ath9k_hw_keyreset(ah, (u16) i);
+
+       /* Collect the channel list using the default country code */
+
+       error = ath_setup_channels(sc);
+       if (error)
+               goto bad;
+
+       /* default to MONITOR mode */
+       sc->sc_ah->ah_opmode = NL80211_IFTYPE_MONITOR;
+
+
+       /* Setup rate tables */
+
+       ath_rate_attach(sc);
+       ath_setup_rates(sc, IEEE80211_BAND_2GHZ);
+       ath_setup_rates(sc, IEEE80211_BAND_5GHZ);
+
+       /*
+        * Allocate hardware transmit queues: one queue for
+        * beacon frames and one data queue for each QoS
+        * priority.  Note that the hal handles reseting
+        * these queues at the needed time.
+        */
+       sc->beacon.beaconq = ath_beaconq_setup(ah);
+       if (sc->beacon.beaconq == -1) {
+               DPRINTF(sc, ATH_DBG_FATAL,
+                       "Unable to setup a beacon xmit queue\n");
+               error = -EIO;
+               goto bad2;
+       }
+       sc->beacon.cabq = ath_txq_setup(sc, ATH9K_TX_QUEUE_CAB, 0);
+       if (sc->beacon.cabq == NULL) {
+               DPRINTF(sc, ATH_DBG_FATAL,
+                       "Unable to setup CAB xmit queue\n");
+               error = -EIO;
+               goto bad2;
+       }
+
+       sc->sc_config.cabqReadytime = ATH_CABQ_READY_TIME;
+       ath_cabq_update(sc);
+
+       for (i = 0; i < ARRAY_SIZE(sc->tx.hwq_map); i++)
+               sc->tx.hwq_map[i] = -1;
+
+       /* Setup data queues */
+       /* NB: ensure BK queue is the lowest priority h/w queue */
+       if (!ath_tx_setup(sc, ATH9K_WME_AC_BK)) {
+               DPRINTF(sc, ATH_DBG_FATAL,
+                       "Unable to setup xmit queue for BK traffic\n");
+               error = -EIO;
+               goto bad2;
+       }
+
+       if (!ath_tx_setup(sc, ATH9K_WME_AC_BE)) {
+               DPRINTF(sc, ATH_DBG_FATAL,
+                       "Unable to setup xmit queue for BE traffic\n");
+               error = -EIO;
+               goto bad2;
+       }
+       if (!ath_tx_setup(sc, ATH9K_WME_AC_VI)) {
+               DPRINTF(sc, ATH_DBG_FATAL,
+                       "Unable to setup xmit queue for VI traffic\n");
+               error = -EIO;
+               goto bad2;
+       }
+       if (!ath_tx_setup(sc, ATH9K_WME_AC_VO)) {
+               DPRINTF(sc, ATH_DBG_FATAL,
+                       "Unable to setup xmit queue for VO traffic\n");
+               error = -EIO;
+               goto bad2;
+       }
+
+       /* Initializes the noise floor to a reasonable default value.
+        * Later on this will be updated during ANI processing. */
+
+       sc->sc_ani.sc_noise_floor = ATH_DEFAULT_NOISE_FLOOR;
+       setup_timer(&sc->sc_ani.timer, ath_ani_calibrate, (unsigned long)sc);
+
+       if (ath9k_hw_getcapability(ah, ATH9K_CAP_CIPHER,
+                                  ATH9K_CIPHER_TKIP, NULL)) {
+               /*
+                * Whether we should enable h/w TKIP MIC.
+                * XXX: if we don't support WME TKIP MIC, then we wouldn't
+                * report WMM capable, so it's always safe to turn on
+                * TKIP MIC in this case.
+                */
+               ath9k_hw_setcapability(sc->sc_ah, ATH9K_CAP_TKIP_MIC,
+                                      0, 1, NULL);
+       }
+
+       /*
+        * Check whether the separate key cache entries
+        * are required to handle both tx+rx MIC keys.
+        * With split mic keys the number of stations is limited
+        * to 27 otherwise 59.
+        */
+       if (ath9k_hw_getcapability(ah, ATH9K_CAP_CIPHER,
+                                  ATH9K_CIPHER_TKIP, NULL)
+           && ath9k_hw_getcapability(ah, ATH9K_CAP_CIPHER,
+                                     ATH9K_CIPHER_MIC, NULL)
+           && ath9k_hw_getcapability(ah, ATH9K_CAP_TKIP_SPLIT,
+                                     0, NULL))
+               sc->sc_splitmic = 1;
+
+       /* turn on mcast key search if possible */
+       if (!ath9k_hw_getcapability(ah, ATH9K_CAP_MCAST_KEYSRCH, 0, NULL))
+               (void)ath9k_hw_setcapability(ah, ATH9K_CAP_MCAST_KEYSRCH, 1,
+                                            1, NULL);
+
+       sc->sc_config.txpowlimit = ATH_TXPOWER_MAX;
+       sc->sc_config.txpowlimit_override = 0;
+
+       /* 11n Capabilities */
+       if (ah->ah_caps.hw_caps & ATH9K_HW_CAP_HT) {
+               sc->sc_flags |= SC_OP_TXAGGR;
+               sc->sc_flags |= SC_OP_RXAGGR;
+       }
+
+       sc->sc_tx_chainmask = ah->ah_caps.tx_chainmask;
+       sc->sc_rx_chainmask = ah->ah_caps.rx_chainmask;
+
+       ath9k_hw_setcapability(ah, ATH9K_CAP_DIVERSITY, 1, true, NULL);
+       sc->rx.defant = ath9k_hw_getdefantenna(ah);
+
+       ath9k_hw_getmac(ah, sc->sc_myaddr);
+       if (ah->ah_caps.hw_caps & ATH9K_HW_CAP_BSSIDMASK) {
+               ath9k_hw_getbssidmask(ah, sc->sc_bssidmask);
+               ATH_SET_VAP_BSSID_MASK(sc->sc_bssidmask);
+               ath9k_hw_setbssidmask(ah, sc->sc_bssidmask);
+       }
+
+       sc->beacon.slottime = ATH9K_SLOT_TIME_9;        /* default to short slot time */
+
+       /* initialize beacon slots */
+       for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++)
+               sc->beacon.bslot[i] = ATH_IF_ID_ANY;
+
+       /* save MISC configurations */
+       sc->sc_config.swBeaconProcess = 1;
+
+       /* setup channels and rates */
+
+       sc->sbands[IEEE80211_BAND_2GHZ].channels =
+               sc->channels[IEEE80211_BAND_2GHZ];
+       sc->sbands[IEEE80211_BAND_2GHZ].bitrates =
+               sc->rates[IEEE80211_BAND_2GHZ];
+       sc->sbands[IEEE80211_BAND_2GHZ].band = IEEE80211_BAND_2GHZ;
+
+       if (test_bit(ATH9K_MODE_11A, sc->sc_ah->ah_caps.wireless_modes)) {
+               sc->sbands[IEEE80211_BAND_5GHZ].channels =
+                       sc->channels[IEEE80211_BAND_5GHZ];
+               sc->sbands[IEEE80211_BAND_5GHZ].bitrates =
+                       sc->rates[IEEE80211_BAND_5GHZ];
+               sc->sbands[IEEE80211_BAND_5GHZ].band = IEEE80211_BAND_5GHZ;
+       }
+
+       if (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_BT_COEX)
+               ath9k_hw_btcoex_enable(sc->sc_ah);
+
+       return 0;
+bad2:
+       /* cleanup tx queues */
+       for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
+               if (ATH_TXQ_SETUP(sc, i))
+                       ath_tx_cleanupq(sc, &sc->tx.txq[i]);
+bad:
+       if (ah)
+               ath9k_hw_detach(ah);
+
+       return error;
+}
+
+int ath_attach(u16 devid, struct ath_softc *sc)
 {
        struct ieee80211_hw *hw = sc->hw;
        int error = 0;
 
-       DPRINTF(sc, ATH_DBG_CONFIG, "%s: Attach ATH hw\n", __func__);
+       DPRINTF(sc, ATH_DBG_CONFIG, "Attach ATH hw\n");
 
        error = ath_init(devid, sc);
        if (error != 0)
@@ -879,111 +1538,398 @@ static int ath_attach(u16 devid, struct ath_softc *sc)
        hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
                IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
                IEEE80211_HW_SIGNAL_DBM |
-               IEEE80211_HW_AMPDU_AGGREGATION;
+               IEEE80211_HW_AMPDU_AGGREGATION |
+               IEEE80211_HW_SUPPORTS_PS |
+               IEEE80211_HW_PS_NULLFUNC_STACK;
+
+       if (AR_SREV_9160_10_OR_LATER(sc->sc_ah))
+               hw->flags |= IEEE80211_HW_MFP_CAPABLE;
+
+       hw->wiphy->interface_modes =
+               BIT(NL80211_IFTYPE_AP) |
+               BIT(NL80211_IFTYPE_STATION) |
+               BIT(NL80211_IFTYPE_ADHOC);
+
+       hw->queues = 4;
+       hw->max_rates = 4;
+       hw->max_rate_tries = ATH_11N_TXMAXTRY;
+       hw->sta_data_size = sizeof(struct ath_node);
+       hw->vif_data_size = sizeof(struct ath_vap);
+
+       hw->rate_control_algorithm = "ath9k_rate_control";
+
+       if (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_HT) {
+               setup_ht_cap(&sc->sbands[IEEE80211_BAND_2GHZ].ht_cap);
+               if (test_bit(ATH9K_MODE_11A, sc->sc_ah->ah_caps.wireless_modes))
+                       setup_ht_cap(&sc->sbands[IEEE80211_BAND_5GHZ].ht_cap);
+       }
+
+       hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &sc->sbands[IEEE80211_BAND_2GHZ];
+       if (test_bit(ATH9K_MODE_11A, sc->sc_ah->ah_caps.wireless_modes))
+               hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
+                       &sc->sbands[IEEE80211_BAND_5GHZ];
+
+       /* initialize tx/rx engine */
+       error = ath_tx_init(sc, ATH_TXBUF);
+       if (error != 0)
+               goto detach;
+
+       error = ath_rx_init(sc, ATH_RXBUF);
+       if (error != 0)
+               goto detach;
+
+#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
+       /* Initialze h/w Rfkill */
+       if (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_RFSILENT)
+               INIT_DELAYED_WORK(&sc->rf_kill.rfkill_poll, ath_rfkill_poll);
+
+       /* Initialize s/w rfkill */
+       if (ath_init_sw_rfkill(sc))
+               goto detach;
+#endif
+
+       error = ieee80211_register_hw(hw);
+
+       /* Initialize LED control */
+       ath_init_leds(sc);
+
+       return 0;
+detach:
+       ath_detach(sc);
+       return error;
+}
+
+int ath_reset(struct ath_softc *sc, bool retry_tx)
+{
+       struct ath_hal *ah = sc->sc_ah;
+       struct ieee80211_hw *hw = sc->hw;
+       int r;
+
+       ath9k_hw_set_interrupts(ah, 0);
+       ath_drain_all_txq(sc, retry_tx);
+       ath_stoprecv(sc);
+       ath_flushrecv(sc);
+
+       spin_lock_bh(&sc->sc_resetlock);
+       r = ath9k_hw_reset(ah, sc->sc_ah->ah_curchan, false);
+       if (r)
+               DPRINTF(sc, ATH_DBG_FATAL,
+                       "Unable to reset hardware; reset status %u\n", r);
+       spin_unlock_bh(&sc->sc_resetlock);
+
+       if (ath_startrecv(sc) != 0)
+               DPRINTF(sc, ATH_DBG_FATAL, "Unable to start recv logic\n");
+
+       /*
+        * We may be doing a reset in response to a request
+        * that changes the channel so update any state that
+        * might change as a result.
+        */
+       ath_cache_conf_rate(sc, &hw->conf);
+
+       ath_update_txpow(sc);
+
+       if (sc->sc_flags & SC_OP_BEACONS)
+               ath_beacon_config(sc, ATH_IF_ID_ANY);   /* restart beacons */
+
+       ath9k_hw_set_interrupts(ah, sc->sc_imask);
+
+       if (retry_tx) {
+               int i;
+               for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
+                       if (ATH_TXQ_SETUP(sc, i)) {
+                               spin_lock_bh(&sc->tx.txq[i].axq_lock);
+                               ath_txq_schedule(sc, &sc->tx.txq[i]);
+                               spin_unlock_bh(&sc->tx.txq[i].axq_lock);
+                       }
+               }
+       }
+
+       return r;
+}
+
+/*
+ *  This function will allocate both the DMA descriptor structure, and the
+ *  buffers it contains.  These are used to contain the descriptors used
+ *  by the system.
+*/
+int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
+                     struct list_head *head, const char *name,
+                     int nbuf, int ndesc)
+{
+#define        DS2PHYS(_dd, _ds)                                               \
+       ((_dd)->dd_desc_paddr + ((caddr_t)(_ds) - (caddr_t)(_dd)->dd_desc))
+#define ATH_DESC_4KB_BOUND_CHECK(_daddr) ((((_daddr) & 0xFFF) > 0xF7F) ? 1 : 0)
+#define ATH_DESC_4KB_BOUND_NUM_SKIPPED(_len) ((_len) / 4096)
+
+       struct ath_desc *ds;
+       struct ath_buf *bf;
+       int i, bsize, error;
+
+       DPRINTF(sc, ATH_DBG_CONFIG, "%s DMA: %u buffers %u desc/buf\n",
+               name, nbuf, ndesc);
+
+       /* ath_desc must be a multiple of DWORDs */
+       if ((sizeof(struct ath_desc) % 4) != 0) {
+               DPRINTF(sc, ATH_DBG_FATAL, "ath_desc not DWORD aligned\n");
+               ASSERT((sizeof(struct ath_desc) % 4) == 0);
+               error = -ENOMEM;
+               goto fail;
+       }
+
+       dd->dd_name = name;
+       dd->dd_desc_len = sizeof(struct ath_desc) * nbuf * ndesc;
 
-       hw->wiphy->interface_modes =
-               BIT(NL80211_IFTYPE_AP) |
-               BIT(NL80211_IFTYPE_STATION) |
-               BIT(NL80211_IFTYPE_ADHOC);
+       /*
+        * Need additional DMA memory because we can't use
+        * descriptors that cross the 4K page boundary. Assume
+        * one skipped descriptor per 4K page.
+        */
+       if (!(sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_4KB_SPLITTRANS)) {
+               u32 ndesc_skipped =
+                       ATH_DESC_4KB_BOUND_NUM_SKIPPED(dd->dd_desc_len);
+               u32 dma_len;
 
-       hw->queues = 4;
-       hw->sta_data_size = sizeof(struct ath_node);
-       hw->vif_data_size = sizeof(struct ath_vap);
+               while (ndesc_skipped) {
+                       dma_len = ndesc_skipped * sizeof(struct ath_desc);
+                       dd->dd_desc_len += dma_len;
 
-       /* Register rate control */
-       hw->rate_control_algorithm = "ath9k_rate_control";
-       error = ath_rate_control_register();
-       if (error != 0) {
-               DPRINTF(sc, ATH_DBG_FATAL,
-                       "%s: Unable to register rate control "
-                       "algorithm:%d\n", __func__, error);
-               ath_rate_control_unregister();
-               goto bad;
+                       ndesc_skipped = ATH_DESC_4KB_BOUND_NUM_SKIPPED(dma_len);
+               };
        }
 
-       if (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_HT) {
-               setup_ht_cap(&sc->sbands[IEEE80211_BAND_2GHZ].ht_cap);
-               if (test_bit(ATH9K_MODE_11A, sc->sc_ah->ah_caps.wireless_modes))
-                       setup_ht_cap(&sc->sbands[IEEE80211_BAND_5GHZ].ht_cap);
+       /* allocate descriptors */
+       dd->dd_desc = dma_alloc_coherent(sc->dev, dd->dd_desc_len,
+                                        &dd->dd_desc_paddr, GFP_ATOMIC);
+       if (dd->dd_desc == NULL) {
+               error = -ENOMEM;
+               goto fail;
        }
-
-       hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &sc->sbands[IEEE80211_BAND_2GHZ];
-       if (test_bit(ATH9K_MODE_11A, sc->sc_ah->ah_caps.wireless_modes))
-               hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
-                       &sc->sbands[IEEE80211_BAND_5GHZ];
-
-       error = ieee80211_register_hw(hw);
-       if (error != 0) {
-               ath_rate_control_unregister();
-               goto bad;
+       ds = dd->dd_desc;
+       DPRINTF(sc, ATH_DBG_CONFIG, "%s DMA map: %p (%u) -> %llx (%u)\n",
+               dd->dd_name, ds, (u32) dd->dd_desc_len,
+               ito64(dd->dd_desc_paddr), /*XXX*/(u32) dd->dd_desc_len);
+
+       /* allocate buffers */
+       bsize = sizeof(struct ath_buf) * nbuf;
+       bf = kmalloc(bsize, GFP_KERNEL);
+       if (bf == NULL) {
+               error = -ENOMEM;
+               goto fail2;
        }
+       memset(bf, 0, bsize);
+       dd->dd_bufptr = bf;
+
+       INIT_LIST_HEAD(head);
+       for (i = 0; i < nbuf; i++, bf++, ds += ndesc) {
+               bf->bf_desc = ds;
+               bf->bf_daddr = DS2PHYS(dd, ds);
+
+               if (!(sc->sc_ah->ah_caps.hw_caps &
+                     ATH9K_HW_CAP_4KB_SPLITTRANS)) {
+                       /*
+                        * Skip descriptor addresses which can cause 4KB
+                        * boundary crossing (addr + length) with a 32 dword
+                        * descriptor fetch.
+                        */
+                       while (ATH_DESC_4KB_BOUND_CHECK(bf->bf_daddr)) {
+                               ASSERT((caddr_t) bf->bf_desc <
+                                      ((caddr_t) dd->dd_desc +
+                                       dd->dd_desc_len));
+
+                               ds += ndesc;
+                               bf->bf_desc = ds;
+                               bf->bf_daddr = DS2PHYS(dd, ds);
+                       }
+               }
+               list_add_tail(&bf->list, head);
+       }
+       return 0;
+fail2:
+       dma_free_coherent(sc->dev, dd->dd_desc_len, dd->dd_desc,
+                         dd->dd_desc_paddr);
+fail:
+       memset(dd, 0, sizeof(*dd));
+       return error;
+#undef ATH_DESC_4KB_BOUND_CHECK
+#undef ATH_DESC_4KB_BOUND_NUM_SKIPPED
+#undef DS2PHYS
+}
 
-       /* Initialize LED control */
-       ath_init_leds(sc);
+void ath_descdma_cleanup(struct ath_softc *sc,
+                        struct ath_descdma *dd,
+                        struct list_head *head)
+{
+       dma_free_coherent(sc->dev, dd->dd_desc_len, dd->dd_desc,
+                         dd->dd_desc_paddr);
 
-#ifdef CONFIG_RFKILL
-       /* Initialze h/w Rfkill */
-       if (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_RFSILENT)
-               INIT_DELAYED_WORK(&sc->rf_kill.rfkill_poll, ath_rfkill_poll);
+       INIT_LIST_HEAD(head);
+       kfree(dd->dd_bufptr);
+       memset(dd, 0, sizeof(*dd));
+}
 
-       /* Initialize s/w rfkill */
-       if (ath_init_sw_rfkill(sc))
-               goto detach;
-#endif
+int ath_get_hal_qnum(u16 queue, struct ath_softc *sc)
+{
+       int qnum;
 
-       /* initialize tx/rx engine */
+       switch (queue) {
+       case 0:
+               qnum = sc->tx.hwq_map[ATH9K_WME_AC_VO];
+               break;
+       case 1:
+               qnum = sc->tx.hwq_map[ATH9K_WME_AC_VI];
+               break;
+       case 2:
+               qnum = sc->tx.hwq_map[ATH9K_WME_AC_BE];
+               break;
+       case 3:
+               qnum = sc->tx.hwq_map[ATH9K_WME_AC_BK];
+               break;
+       default:
+               qnum = sc->tx.hwq_map[ATH9K_WME_AC_BE];
+               break;
+       }
 
-       error = ath_tx_init(sc, ATH_TXBUF);
-       if (error != 0)
-               goto detach;
+       return qnum;
+}
 
-       error = ath_rx_init(sc, ATH_RXBUF);
-       if (error != 0)
-               goto detach;
+int ath_get_mac80211_qnum(u32 queue, struct ath_softc *sc)
+{
+       int qnum;
 
-       return 0;
-detach:
-       ath_detach(sc);
-bad:
-       return error;
+       switch (queue) {
+       case ATH9K_WME_AC_VO:
+               qnum = 0;
+               break;
+       case ATH9K_WME_AC_VI:
+               qnum = 1;
+               break;
+       case ATH9K_WME_AC_BE:
+               qnum = 2;
+               break;
+       case ATH9K_WME_AC_BK:
+               qnum = 3;
+               break;
+       default:
+               qnum = -1;
+               break;
+       }
+
+       return qnum;
 }
 
+/**********************/
+/* mac80211 callbacks */
+/**********************/
+
 static int ath9k_start(struct ieee80211_hw *hw)
 {
        struct ath_softc *sc = hw->priv;
        struct ieee80211_channel *curchan = hw->conf.channel;
-       int error = 0, pos;
-
-       DPRINTF(sc, ATH_DBG_CONFIG, "%s: Starting driver with "
-               "initial channel: %d MHz\n", __func__, curchan->center_freq);
+       struct ath9k_channel *init_channel;
+       int r, pos;
 
-       memset(&sc->sc_ht_info, 0, sizeof(struct ath_ht_info));
+       DPRINTF(sc, ATH_DBG_CONFIG, "Starting driver with "
+               "initial channel: %d MHz\n", curchan->center_freq);
 
        /* setup initial channel */
 
        pos = ath_get_channel(sc, curchan);
        if (pos == -1) {
-               DPRINTF(sc, ATH_DBG_FATAL, "%s: Invalid channel\n", __func__);
-               error = -EINVAL;
-               goto exit;
+               DPRINTF(sc, ATH_DBG_FATAL, "Invalid channel: %d\n", curchan->center_freq);
+               return -EINVAL;
        }
 
+       sc->tx_chan_width = ATH9K_HT_MACMODE_20;
        sc->sc_ah->ah_channels[pos].chanmode =
                (curchan->band == IEEE80211_BAND_2GHZ) ? CHANNEL_G : CHANNEL_A;
+       init_channel = &sc->sc_ah->ah_channels[pos];
 
-       error = ath_open(sc, &sc->sc_ah->ah_channels[pos]);
-       if (error) {
+       /* Reset SERDES registers */
+       ath9k_hw_configpcipowersave(sc->sc_ah, 0);
+
+       /*
+        * The basic interface to setting the hardware in a good
+        * state is ``reset''.  On return the hardware is known to
+        * be powered up and with interrupts disabled.  This must
+        * be followed by initialization of the appropriate bits
+        * and then setup of the interrupt mask.
+        */
+       spin_lock_bh(&sc->sc_resetlock);
+       r = ath9k_hw_reset(sc->sc_ah, init_channel, false);
+       if (r) {
                DPRINTF(sc, ATH_DBG_FATAL,
-                       "%s: Unable to complete ath_open\n", __func__);
-               goto exit;
+                       "Unable to reset hardware; reset status %u "
+                       "(freq %u MHz)\n", r,
+                       curchan->center_freq);
+               spin_unlock_bh(&sc->sc_resetlock);
+               return r;
        }
+       spin_unlock_bh(&sc->sc_resetlock);
 
-#ifdef CONFIG_RFKILL
-       error = ath_start_rfkill_poll(sc);
-#endif
+       /*
+        * This is needed only to setup initial state
+        * but it's best done after a reset.
+        */
+       ath_update_txpow(sc);
 
-exit:
-       return error;
+       /*
+        * Setup the hardware after reset:
+        * The receive engine is set going.
+        * Frame transmit is handled entirely
+        * in the frame output path; there's nothing to do
+        * here except setup the interrupt mask.
+        */
+       if (ath_startrecv(sc) != 0) {
+               DPRINTF(sc, ATH_DBG_FATAL,
+                       "Unable to start recv logic\n");
+               return -EIO;
+       }
+
+       /* Setup our intr mask. */
+       sc->sc_imask = ATH9K_INT_RX | ATH9K_INT_TX
+               | ATH9K_INT_RXEOL | ATH9K_INT_RXORN
+               | ATH9K_INT_FATAL | ATH9K_INT_GLOBAL;
+
+       if (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_GTT)
+               sc->sc_imask |= ATH9K_INT_GTT;
+
+       if (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_HT)
+               sc->sc_imask |= ATH9K_INT_CST;
+
+       /*
+        * Enable MIB interrupts when there are hardware phy counters.
+        * Note we only do this (at the moment) for station mode.
+        */
+       if (ath9k_hw_phycounters(sc->sc_ah) &&
+           ((sc->sc_ah->ah_opmode == NL80211_IFTYPE_STATION) ||
+            (sc->sc_ah->ah_opmode == NL80211_IFTYPE_ADHOC)))
+               sc->sc_imask |= ATH9K_INT_MIB;
+       /*
+        * Some hardware processes the TIM IE and fires an
+        * interrupt when the TIM bit is set.  For hardware
+        * that does, if not overridden by configuration,
+        * enable the TIM interrupt when operating as station.
+        */
+       if ((sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_ENHANCEDPM) &&
+           (sc->sc_ah->ah_opmode == NL80211_IFTYPE_STATION) &&
+           !sc->sc_config.swBeaconProcess)
+               sc->sc_imask |= ATH9K_INT_TIM;
+
+       ath_cache_conf_rate(sc, &hw->conf);
+
+       sc->sc_flags &= ~SC_OP_INVALID;
+
+       /* Disable BMISS interrupt when we're not associated */
+       sc->sc_imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS);
+       ath9k_hw_set_interrupts(sc->sc_ah, sc->sc_imask);
+
+       ieee80211_wake_queues(sc->hw);
+
+#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
+       r = ath_start_rfkill_poll(sc);
+#endif
+       return r;
 }
 
 static int ath9k_tx(struct ieee80211_hw *hw,
@@ -1004,9 +1950,9 @@ static int ath9k_tx(struct ieee80211_hw *hw,
        if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
                struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
                if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
-                       sc->seq_no += 0x10;
+                       sc->tx.seq_no += 0x10;
                hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
-               hdr->seq_ctrl |= cpu_to_le16(sc->seq_no);
+               hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no);
        }
 
        /* Add the padding after the header if this is not already done */
@@ -1025,12 +1971,10 @@ static int ath9k_tx(struct ieee80211_hw *hw,
        if (!txctl.txq)
                goto exit;
 
-       DPRINTF(sc, ATH_DBG_XMIT, "%s: transmitting packet, skb: %p\n",
-               __func__,
-               skb);
+       DPRINTF(sc, ATH_DBG_XMIT, "transmitting packet, skb: %p\n", skb);
 
        if (ath_tx_start(sc, skb, &txctl) != 0) {
-               DPRINTF(sc, ATH_DBG_XMIT, "%s: TX failed\n", __func__);
+               DPRINTF(sc, ATH_DBG_XMIT, "TX failed\n");
                goto exit;
        }
 
@@ -1045,13 +1989,36 @@ static void ath9k_stop(struct ieee80211_hw *hw)
        struct ath_softc *sc = hw->priv;
 
        if (sc->sc_flags & SC_OP_INVALID) {
-               DPRINTF(sc, ATH_DBG_ANY, "%s: Device not present\n", __func__);
+               DPRINTF(sc, ATH_DBG_ANY, "Device not present\n");
                return;
        }
 
-       ath_stop(sc);
+       DPRINTF(sc, ATH_DBG_CONFIG, "Cleaning up\n");
+
+       ieee80211_stop_queues(sc->hw);
+
+       /* make sure h/w will not generate any interrupt
+        * before setting the invalid flag. */
+       ath9k_hw_set_interrupts(sc->sc_ah, 0);
+
+       if (!(sc->sc_flags & SC_OP_INVALID)) {
+               ath_drain_all_txq(sc, false);
+               ath_stoprecv(sc);
+               ath9k_hw_phy_disable(sc->sc_ah);
+       } else
+               sc->rx.rxlink = NULL;
+
+#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
+       if (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_RFSILENT)
+               cancel_delayed_work_sync(&sc->rf_kill.rfkill_poll);
+#endif
+       /* disable HAL and put h/w to sleep */
+       ath9k_hw_disable(sc->sc_ah);
+       ath9k_hw_configpcipowersave(sc->sc_ah, 1);
+
+       sc->sc_flags |= SC_OP_INVALID;
 
-       DPRINTF(sc, ATH_DBG_CONFIG, "%s: Driver halt\n", __func__);
+       DPRINTF(sc, ATH_DBG_CONFIG, "Driver halt\n");
 }
 
 static int ath9k_add_interface(struct ieee80211_hw *hw,
@@ -1059,7 +2026,7 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,
 {
        struct ath_softc *sc = hw->priv;
        struct ath_vap *avp = (void *)conf->vif->drv_priv;
-       int ic_opmode = 0;
+       enum nl80211_iftype ic_opmode = NL80211_IFTYPE_UNSPECIFIED;
 
        /* Support only vap for now */
 
@@ -1068,30 +2035,27 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,
 
        switch (conf->type) {
        case NL80211_IFTYPE_STATION:
-               ic_opmode = ATH9K_M_STA;
+               ic_opmode = NL80211_IFTYPE_STATION;
                break;
        case NL80211_IFTYPE_ADHOC:
-               ic_opmode = ATH9K_M_IBSS;
+               ic_opmode = NL80211_IFTYPE_ADHOC;
                break;
        case NL80211_IFTYPE_AP:
-               ic_opmode = ATH9K_M_HOSTAP;
+               ic_opmode = NL80211_IFTYPE_AP;
                break;
        default:
                DPRINTF(sc, ATH_DBG_FATAL,
-                       "%s: Interface type %d not yet supported\n",
-                       __func__, conf->type);
+                       "Interface type %d not yet supported\n", conf->type);
                return -EOPNOTSUPP;
        }
 
-       DPRINTF(sc, ATH_DBG_CONFIG, "%s: Attach a VAP of type: %d\n",
-               __func__,
-               ic_opmode);
+       DPRINTF(sc, ATH_DBG_CONFIG, "Attach a VAP of type: %d\n", ic_opmode);
 
        /* Set the VAP opmode */
        avp->av_opmode = ic_opmode;
        avp->av_bslot = -1;
 
-       if (ic_opmode == ATH9K_M_HOSTAP)
+       if (ic_opmode == NL80211_IFTYPE_AP)
                ath9k_hw_set_tsfadjust(sc->sc_ah, 1);
 
        sc->sc_vaps[0] = conf->vif;
@@ -1100,10 +2064,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,
        /* Set the device opmode */
        sc->sc_ah->ah_opmode = ic_opmode;
 
-       /* default VAP configuration */
-       avp->av_config.av_fixed_rateset = IEEE80211_FIXED_RATE_NONE;
-       avp->av_config.av_fixed_retryset = 0x03030303;
-
        if (conf->type == NL80211_IFTYPE_AP) {
                /* TODO: is this a suitable place to start ANI for AP mode? */
                /* Start ANI */
@@ -1120,18 +2080,15 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,
        struct ath_softc *sc = hw->priv;
        struct ath_vap *avp = (void *)conf->vif->drv_priv;
 
-       DPRINTF(sc, ATH_DBG_CONFIG, "%s: Detach VAP\n", __func__);
+       DPRINTF(sc, ATH_DBG_CONFIG, "Detach Interface\n");
 
-#ifdef CONFIG_SLOW_ANT_DIV
-       ath_slow_ant_div_stop(&sc->sc_antdiv);
-#endif
        /* Stop ANI */
        del_timer_sync(&sc->sc_ani.timer);
 
        /* Reclaim beacon resources */
-       if (sc->sc_ah->ah_opmode == ATH9K_M_HOSTAP ||
-           sc->sc_ah->ah_opmode == ATH9K_M_IBSS) {
-               ath9k_hw_stoptxdma(sc->sc_ah, sc->sc_bhalq);
+       if (sc->sc_ah->ah_opmode == NL80211_IFTYPE_AP ||
+           sc->sc_ah->ah_opmode == NL80211_IFTYPE_ADHOC) {
+               ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);
                ath_beacon_return(sc, avp);
        }
 
@@ -1144,39 +2101,72 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,
 static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
 {
        struct ath_softc *sc = hw->priv;
-       struct ieee80211_channel *curchan = hw->conf.channel;
        struct ieee80211_conf *conf = &hw->conf;
-       int pos;
 
-       DPRINTF(sc, ATH_DBG_CONFIG, "%s: Set channel: %d MHz\n",
-               __func__,
-               curchan->center_freq);
+       mutex_lock(&sc->mutex);
+       if (changed & IEEE80211_CONF_CHANGE_PS) {
+               if (conf->flags & IEEE80211_CONF_PS) {
+                       if ((sc->sc_imask & ATH9K_INT_TIM_TIMER) == 0) {
+                               sc->sc_imask |= ATH9K_INT_TIM_TIMER;
+                               ath9k_hw_set_interrupts(sc->sc_ah,
+                                               sc->sc_imask);
+                       }
+                       ath9k_hw_setrxabort(sc->sc_ah, 1);
+                       ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_NETWORK_SLEEP);
+               } else {
+                       ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);
+                       ath9k_hw_setrxabort(sc->sc_ah, 0);
+                       sc->sc_flags &= ~SC_OP_WAIT_FOR_BEACON;
+                       if (sc->sc_imask & ATH9K_INT_TIM_TIMER) {
+                               sc->sc_imask &= ~ATH9K_INT_TIM_TIMER;
+                               ath9k_hw_set_interrupts(sc->sc_ah,
+                                               sc->sc_imask);
+                       }
+               }
+       }
 
-       /* Update chainmask */
-       ath_update_chainmask(sc, conf->ht.enabled);
+       if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+               struct ieee80211_channel *curchan = hw->conf.channel;
+               int pos;
 
-       pos = ath_get_channel(sc, curchan);
-       if (pos == -1) {
-               DPRINTF(sc, ATH_DBG_FATAL, "%s: Invalid channel\n", __func__);
-               return -EINVAL;
-       }
+               DPRINTF(sc, ATH_DBG_CONFIG, "Set channel: %d MHz\n",
+                       curchan->center_freq);
 
-       sc->sc_ah->ah_channels[pos].chanmode =
-               (curchan->band == IEEE80211_BAND_2GHZ) ?
-               CHANNEL_G : CHANNEL_A;
+               pos = ath_get_channel(sc, curchan);
+               if (pos == -1) {
+                       DPRINTF(sc, ATH_DBG_FATAL, "Invalid channel: %d\n",
+                               curchan->center_freq);
+                       mutex_unlock(&sc->mutex);
+                       return -EINVAL;
+               }
 
-       if (sc->sc_curaid && hw->conf.ht.enabled)
+               sc->tx_chan_width = ATH9K_HT_MACMODE_20;
                sc->sc_ah->ah_channels[pos].chanmode =
-                       ath_get_extchanmode(sc, curchan);
+                       (curchan->band == IEEE80211_BAND_2GHZ) ?
+                       CHANNEL_G : CHANNEL_A;
+
+               if (conf_is_ht(conf)) {
+                       if (conf_is_ht40(conf))
+                               sc->tx_chan_width = ATH9K_HT_MACMODE_2040;
+
+                       sc->sc_ah->ah_channels[pos].chanmode =
+                               ath_get_extchanmode(sc, curchan,
+                                                   conf->channel_type);
+               }
+
+               ath_update_chainmask(sc, conf_is_ht(conf));
+
+               if (ath_set_channel(sc, &sc->sc_ah->ah_channels[pos]) < 0) {
+                       DPRINTF(sc, ATH_DBG_FATAL, "Unable to set channel\n");
+                       mutex_unlock(&sc->mutex);
+                       return -EINVAL;
+               }
+       }
 
        if (changed & IEEE80211_CONF_CHANGE_POWER)
                sc->sc_config.txpowlimit = 2 * conf->power_level;
 
-       /* set h/w channel */
-       if (ath_set_channel(sc, &sc->sc_ah->ah_channels[pos]) < 0)
-               DPRINTF(sc, ATH_DBG_FATAL, "%s: Unable to set channel\n",
-                       __func__);
-
+       mutex_unlock(&sc->mutex);
        return 0;
 }
 
@@ -1193,8 +2183,8 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
        /* TODO: Need to decide which hw opmode to use for multi-interface
         * cases */
        if (vif->type == NL80211_IFTYPE_AP &&
-           ah->ah_opmode != ATH9K_M_HOSTAP) {
-               ah->ah_opmode = ATH9K_M_HOSTAP;
+           ah->ah_opmode != NL80211_IFTYPE_AP) {
+               ah->ah_opmode = NL80211_IFTYPE_STATION;
                ath9k_hw_setopmode(ah);
                ath9k_hw_write_associd(ah, sc->sc_myaddr, 0);
                /* Request full reset to get hw opmode changed properly */
@@ -1206,9 +2196,6 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
                switch (vif->type) {
                case NL80211_IFTYPE_STATION:
                case NL80211_IFTYPE_ADHOC:
-                       /* Update ratectrl about the new state */
-                       ath_rate_newstate(sc, avp);
-
                        /* Set BSSID */
                        memcpy(sc->sc_curbssid, conf->bssid, ETH_ALEN);
                        sc->sc_curaid = 0;
@@ -1219,9 +2206,8 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
                        sc->sc_config.ath_aggr_prot = 0;
 
                        DPRINTF(sc, ATH_DBG_CONFIG,
-                               "%s: RX filter 0x%x bssid %pM aid 0x%x\n",
-                               __func__, rfilt,
-                               sc->sc_curbssid, sc->sc_curaid);
+                               "RX filter 0x%x bssid %pM aid 0x%x\n",
+                               rfilt, sc->sc_curbssid, sc->sc_curaid);
 
                        /* need to reconfigure the beacon */
                        sc->sc_flags &= ~SC_OP_BEACONS ;
@@ -1243,7 +2229,7 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
                 * causes reconfiguration; we may be called
                 * with beacon transmission active.
                 */
-               ath9k_hw_stoptxdma(sc->sc_ah, sc->sc_bhalq);
+               ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);
 
                error = ath_beacon_alloc(sc, 0);
                if (error != 0)
@@ -1253,7 +2239,7 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
        }
 
        /* Check for WLAN_CAPABILITY_PRIVACY ? */
-       if ((avp->av_opmode != ATH9K_M_STA)) {
+       if ((avp->av_opmode != NL80211_IFTYPE_STATION)) {
                for (i = 0; i < IEEE80211_WEP_NKID; i++)
                        if (ath9k_hw_keyisvalid(sc->sc_ah, (u16)i))
                                ath9k_hw_keysetmac(sc->sc_ah,
@@ -1289,7 +2275,7 @@ static void ath9k_configure_filter(struct ieee80211_hw *hw,
        changed_flags &= SUPPORTED_FILTERS;
        *total_flags &= SUPPORTED_FILTERS;
 
-       sc->rx_filter = *total_flags;
+       sc->rx.rxfilter = *total_flags;
        rfilt = ath_calcrxfilter(sc);
        ath9k_hw_setrxfilter(sc->sc_ah, rfilt);
 
@@ -1298,8 +2284,7 @@ static void ath9k_configure_filter(struct ieee80211_hw *hw,
                        ath9k_hw_write_associd(sc->sc_ah, ath_bcast_mac, 0);
        }
 
-       DPRINTF(sc, ATH_DBG_CONFIG, "%s: Set HW RX filter: 0x%x\n",
-               __func__, sc->rx_filter);
+       DPRINTF(sc, ATH_DBG_CONFIG, "Set HW RX filter: 0x%x\n", sc->rx.rxfilter);
 }
 
 static void ath9k_sta_notify(struct ieee80211_hw *hw,
@@ -1339,55 +2324,52 @@ static int ath9k_conf_tx(struct ieee80211_hw *hw,
        qnum = ath_get_hal_qnum(queue, sc);
 
        DPRINTF(sc, ATH_DBG_CONFIG,
-               "%s: Configure tx [queue/halq] [%d/%d],  "
+               "Configure tx [queue/halq] [%d/%d],  "
                "aifs: %d, cw_min: %d, cw_max: %d, txop: %d\n",
-               __func__,
-               queue,
-               qnum,
-               params->aifs,
-               params->cw_min,
-               params->cw_max,
-               params->txop);
+               queue, qnum, params->aifs, params->cw_min,
+               params->cw_max, params->txop);
 
        ret = ath_txq_update(sc, qnum, &qi);
        if (ret)
-               DPRINTF(sc, ATH_DBG_FATAL,
-                       "%s: TXQ Update failed\n", __func__);
+               DPRINTF(sc, ATH_DBG_FATAL, "TXQ Update failed\n");
 
        return ret;
 }
 
 static int ath9k_set_key(struct ieee80211_hw *hw,
                         enum set_key_cmd cmd,
-                        const u8 *local_addr,
-                        const u8 *addr,
+                        struct ieee80211_vif *vif,
+                        struct ieee80211_sta *sta,
                         struct ieee80211_key_conf *key)
 {
        struct ath_softc *sc = hw->priv;
        int ret = 0;
 
-       DPRINTF(sc, ATH_DBG_KEYCACHE, " %s: Set HW Key\n", __func__);
+       ath9k_ps_wakeup(sc);
+       DPRINTF(sc, ATH_DBG_KEYCACHE, "Set HW Key\n");
 
        switch (cmd) {
        case SET_KEY:
-               ret = ath_key_config(sc, addr, key);
-               if (!ret) {
-                       set_bit(key->keyidx, sc->sc_keymap);
-                       key->hw_key_idx = key->keyidx;
+               ret = ath_key_config(sc, sta, key);
+               if (ret >= 0) {
+                       key->hw_key_idx = ret;
                        /* push IV and Michael MIC generation to stack */
                        key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
                        if (key->alg == ALG_TKIP)
                                key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
+                       if (sc->sc_ah->sw_mgmt_crypto && key->alg == ALG_CCMP)
+                               key->flags |= IEEE80211_KEY_FLAG_SW_MGMT;
+                       ret = 0;
                }
                break;
        case DISABLE_KEY:
                ath_key_delete(sc, key);
-               clear_bit(key->keyidx, sc->sc_keymap);
                break;
        default:
                ret = -EINVAL;
        }
 
+       ath9k_ps_restore(sc);
        return ret;
 }
 
@@ -1399,8 +2381,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
        struct ath_softc *sc = hw->priv;
 
        if (changed & BSS_CHANGED_ERP_PREAMBLE) {
-               DPRINTF(sc, ATH_DBG_CONFIG, "%s: BSS Changed PREAMBLE %d\n",
-                       __func__,
+               DPRINTF(sc, ATH_DBG_CONFIG, "BSS Changed PREAMBLE %d\n",
                        bss_conf->use_short_preamble);
                if (bss_conf->use_short_preamble)
                        sc->sc_flags |= SC_OP_PREAMBLE_SHORT;
@@ -1409,8 +2390,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
        }
 
        if (changed & BSS_CHANGED_ERP_CTS_PROT) {
-               DPRINTF(sc, ATH_DBG_CONFIG, "%s: BSS Changed CTS PROT %d\n",
-                       __func__,
+               DPRINTF(sc, ATH_DBG_CONFIG, "BSS Changed CTS PROT %d\n",
                        bss_conf->use_cts_prot);
                if (bss_conf->use_cts_prot &&
                    hw->conf.channel->band != IEEE80211_BAND_5GHZ)
@@ -1419,15 +2399,8 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
                        sc->sc_flags &= ~SC_OP_PROTECT_ENABLE;
        }
 
-       if (changed & BSS_CHANGED_HT) {
-               DPRINTF(sc, ATH_DBG_CONFIG, "%s: BSS Changed HT\n",
-                       __func__);
-               ath9k_ht_conf(sc, bss_conf);
-       }
-
        if (changed & BSS_CHANGED_ASSOC) {
-               DPRINTF(sc, ATH_DBG_CONFIG, "%s: BSS Changed ASSOC %d\n",
-                       __func__,
+               DPRINTF(sc, ATH_DBG_CONFIG, "BSS Changed ASSOC %d\n",
                        bss_conf->assoc);
                ath9k_bss_assoc_info(sc, vif, bss_conf);
        }
@@ -1471,8 +2444,7 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
                ret = ath_tx_aggr_start(sc, sta, tid, ssn);
                if (ret < 0)
                        DPRINTF(sc, ATH_DBG_FATAL,
-                               "%s: Unable to start TX aggregation\n",
-                               __func__);
+                               "Unable to start TX aggregation\n");
                else
                        ieee80211_start_tx_ba_cb_irqsafe(hw, sta->addr, tid);
                break;
@@ -1480,8 +2452,7 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
                ret = ath_tx_aggr_stop(sc, sta, tid);
                if (ret < 0)
                        DPRINTF(sc, ATH_DBG_FATAL,
-                               "%s: Unable to stop TX aggregation\n",
-                               __func__);
+                               "Unable to stop TX aggregation\n");
 
                ieee80211_stop_tx_ba_cb_irqsafe(hw, sta->addr, tid);
                break;
@@ -1489,19 +2460,13 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
                ath_tx_aggr_resume(sc, sta, tid);
                break;
        default:
-               DPRINTF(sc, ATH_DBG_FATAL,
-                       "%s: Unknown AMPDU action\n", __func__);
+               DPRINTF(sc, ATH_DBG_FATAL, "Unknown AMPDU action\n");
        }
 
        return ret;
 }
 
-static int ath9k_no_fragmentation(struct ieee80211_hw *hw, u32 value)
-{
-       return -EOPNOTSUPP;
-}
-
-static struct ieee80211_ops ath9k_ops = {
+struct ieee80211_ops ath9k_ops = {
        .tx                 = ath9k_tx,
        .start              = ath9k_start,
        .stop               = ath9k_stop,
@@ -1517,7 +2482,6 @@ static struct ieee80211_ops ath9k_ops = {
        .get_tsf            = ath9k_get_tsf,
        .reset_tsf          = ath9k_reset_tsf,
        .ampdu_action       = ath9k_ampdu_action,
-       .set_frag_threshold = ath9k_no_fragmentation,
 };
 
 static struct {
@@ -1546,8 +2510,7 @@ static struct {
 /*
  * Return the MAC/BB name. "????" is returned if the MAC/BB is unknown.
  */
-
-static const char *
+const char *
 ath_mac_bb_name(u32 mac_bb_version)
 {
        int i;
@@ -1564,8 +2527,7 @@ ath_mac_bb_name(u32 mac_bb_version)
 /*
  * Return the RF name. "????" is returned if the RF is unknown.
  */
-
-static const char *
+const char *
 ath_rf_name(u16 rf_version)
 {
        int i;
@@ -1579,232 +2541,52 @@ ath_rf_name(u16 rf_version)
        return "????";
 }
 
-static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+static int __init ath9k_init(void)
 {
-       void __iomem *mem;
-       struct ath_softc *sc;
-       struct ieee80211_hw *hw;
-       u8 csz;
-       u32 val;
-       int ret = 0;
-       struct ath_hal *ah;
-
-       if (pci_enable_device(pdev))
-               return -EIO;
-
-       /* XXX 32-bit addressing only */
-       if (pci_set_dma_mask(pdev, 0xffffffff)) {
-               printk(KERN_ERR "ath_pci: 32-bit DMA not available\n");
-               ret = -ENODEV;
-               goto bad;
-       }
-
-       /*
-        * Cache line size is used to size and align various
-        * structures used to communicate with the hardware.
-        */
-       pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &csz);
-       if (csz == 0) {
-               /*
-                * Linux 2.4.18 (at least) writes the cache line size
-                * register as a 16-bit wide register which is wrong.
-                * We must have this setup properly for rx buffer
-                * DMA to work so force a reasonable value here if it
-                * comes up zero.
-                */
-               csz = L1_CACHE_BYTES / sizeof(u32);
-               pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, csz);
-       }
-       /*
-        * The default setting of latency timer yields poor results,
-        * set it to the value used by other systems. It may be worth
-        * tweaking this setting more.
-        */
-       pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0xa8);
-
-       pci_set_master(pdev);
-
-       /*
-        * Disable the RETRY_TIMEOUT register (0x41) to keep
-        * PCI Tx retries from interfering with C3 CPU state.
-        */
-       pci_read_config_dword(pdev, 0x40, &val);
-       if ((val & 0x0000ff00) != 0)
-               pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
-
-       ret = pci_request_region(pdev, 0, "ath9k");
-       if (ret) {
-               dev_err(&pdev->dev, "PCI memory region reserve error\n");
-               ret = -ENODEV;
-               goto bad;
-       }
+       int error;
 
-       mem = pci_iomap(pdev, 0, 0);
-       if (!mem) {
-               printk(KERN_ERR "PCI memory map error\n") ;
-               ret = -EIO;
-               goto bad1;
-       }
+       printk(KERN_INFO "%s: %s\n", dev_info, ATH_PCI_VERSION);
 
-       hw = ieee80211_alloc_hw(sizeof(struct ath_softc), &ath9k_ops);
-       if (hw == NULL) {
-               printk(KERN_ERR "ath_pci: no memory for ieee80211_hw\n");
-               goto bad2;
+       /* Register rate control algorithm */
+       error = ath_rate_control_register();
+       if (error != 0) {
+               printk(KERN_ERR
+                       "Unable to register rate control algorithm: %d\n",
+                       error);
+               goto err_out;
        }
 
-       SET_IEEE80211_DEV(hw, &pdev->dev);
-       pci_set_drvdata(pdev, hw);
-
-       sc = hw->priv;
-       sc->hw = hw;
-       sc->pdev = pdev;
-       sc->mem = mem;
-
-       if (ath_attach(id->device, sc) != 0) {
-               ret = -ENODEV;
-               goto bad3;
+       error = ath_pci_init();
+       if (error < 0) {
+               printk(KERN_ERR
+                       "ath_pci: No devices found, driver not installed.\n");
+               error = -ENODEV;
+               goto err_rate_unregister;
        }
 
-       /* setup interrupt service routine */
-
-       if (request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath", sc)) {
-               printk(KERN_ERR "%s: request_irq failed\n",
-                       wiphy_name(hw->wiphy));
-               ret = -EIO;
-               goto bad4;
+       error = ath_ahb_init();
+       if (error < 0) {
+               error = -ENODEV;
+               goto err_pci_exit;
        }
 
-       ah = sc->sc_ah;
-       printk(KERN_INFO
-              "%s: Atheros AR%s MAC/BB Rev:%x "
-              "AR%s RF Rev:%x: mem=0x%lx, irq=%d\n",
-              wiphy_name(hw->wiphy),
-              ath_mac_bb_name(ah->ah_macVersion),
-              ah->ah_macRev,
-              ath_rf_name((ah->ah_analog5GhzRev & AR_RADIO_SREV_MAJOR)),
-              ah->ah_phyRev,
-              (unsigned long)mem, pdev->irq);
-
-       return 0;
-bad4:
-       ath_detach(sc);
-bad3:
-       ieee80211_free_hw(hw);
-bad2:
-       pci_iounmap(pdev, mem);
-bad1:
-       pci_release_region(pdev, 0);
-bad:
-       pci_disable_device(pdev);
-       return ret;
-}
-
-static void ath_pci_remove(struct pci_dev *pdev)
-{
-       struct ieee80211_hw *hw = pci_get_drvdata(pdev);
-       struct ath_softc *sc = hw->priv;
-
-       ath_detach(sc);
-       if (pdev->irq)
-               free_irq(pdev->irq, sc);
-       pci_iounmap(pdev, sc->mem);
-       pci_release_region(pdev, 0);
-       pci_disable_device(pdev);
-       ieee80211_free_hw(hw);
-}
-
-#ifdef CONFIG_PM
-
-static int ath_pci_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-       struct ieee80211_hw *hw = pci_get_drvdata(pdev);
-       struct ath_softc *sc = hw->priv;
-
-       ath9k_hw_set_gpio(sc->sc_ah, ATH_LED_PIN, 1);
-
-#ifdef CONFIG_RFKILL
-       if (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_RFSILENT)
-               cancel_delayed_work_sync(&sc->rf_kill.rfkill_poll);
-#endif
-
-       pci_save_state(pdev);
-       pci_disable_device(pdev);
-       pci_set_power_state(pdev, 3);
-
-       return 0;
-}
-
-static int ath_pci_resume(struct pci_dev *pdev)
-{
-       struct ieee80211_hw *hw = pci_get_drvdata(pdev);
-       struct ath_softc *sc = hw->priv;
-       u32 val;
-       int err;
-
-       err = pci_enable_device(pdev);
-       if (err)
-               return err;
-       pci_restore_state(pdev);
-       /*
-        * Suspend/Resume resets the PCI configuration space, so we have to
-        * re-disable the RETRY_TIMEOUT register (0x41) to keep
-        * PCI Tx retries from interfering with C3 CPU state
-        */
-       pci_read_config_dword(pdev, 0x40, &val);
-       if ((val & 0x0000ff00) != 0)
-               pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
-
-       /* Enable LED */
-       ath9k_hw_cfg_output(sc->sc_ah, ATH_LED_PIN,
-                           AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-       ath9k_hw_set_gpio(sc->sc_ah, ATH_LED_PIN, 1);
-
-#ifdef CONFIG_RFKILL
-       /*
-        * check the h/w rfkill state on resume
-        * and start the rfkill poll timer
-        */
-       if (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_RFSILENT)
-               queue_delayed_work(sc->hw->workqueue,
-                                  &sc->rf_kill.rfkill_poll, 0);
-#endif
-
        return 0;
-}
-
-#endif /* CONFIG_PM */
-
-MODULE_DEVICE_TABLE(pci, ath_pci_id_table);
-
-static struct pci_driver ath_pci_driver = {
-       .name       = "ath9k",
-       .id_table   = ath_pci_id_table,
-       .probe      = ath_pci_probe,
-       .remove     = ath_pci_remove,
-#ifdef CONFIG_PM
-       .suspend    = ath_pci_suspend,
-       .resume     = ath_pci_resume,
-#endif /* CONFIG_PM */
-};
-
-static int __init init_ath_pci(void)
-{
-       printk(KERN_INFO "%s: %s\n", dev_info, ATH_PCI_VERSION);
 
-       if (pci_register_driver(&ath_pci_driver) < 0) {
-               printk(KERN_ERR
-                       "ath_pci: No devices found, driver not installed.\n");
-               pci_unregister_driver(&ath_pci_driver);
-               return -ENODEV;
-       }
+ err_pci_exit:
+       ath_pci_exit();
 
-       return 0;
+ err_rate_unregister:
+       ath_rate_control_unregister();
+ err_out:
+       return error;
 }
-module_init(init_ath_pci);
+module_init(ath9k_init);
 
-static void __exit exit_ath_pci(void)
+static void __exit ath9k_exit(void)
 {
-       pci_unregister_driver(&ath_pci_driver);
-       printk(KERN_INFO "%s: driver unloaded\n", dev_info);
+       ath_ahb_exit();
+       ath_pci_exit();
+       ath_rate_control_unregister();
+       printk(KERN_INFO "%s: Driver unloaded\n", dev_info);
 }
-module_exit(exit_ath_pci);
+module_exit(ath9k_exit);