1 files changed, 287 insertions, 287 deletions

diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index 0676c6d84383..9b95c4049b31 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -72,7 +72,7 @@ MODULE_AUTHOR("Nick Kossifidis");
 MODULE_DESCRIPTION("Support for 5xxx series of Atheros 802.11 wireless LAN cards.");
 MODULE_SUPPORTED_DEVICE("Atheros 5xxx WLAN cards");
 MODULE_LICENSE("Dual BSD/GPL");
-MODULE_VERSION("0.5.0 (EXPERIMENTAL)");
+MODULE_VERSION("0.6.0 (EXPERIMENTAL)");
 
 
 /* Known PCI ids */
@@ -93,45 +93,94 @@ static struct pci_device_id ath5k_pci_id_table[] __devinitdata = {
         { PCI_VDEVICE(ATHEROS, 0x0019), .driver_data = AR5K_AR5212 }, /* 5212 combatible */
         { PCI_VDEVICE(ATHEROS, 0x001a), .driver_data = AR5K_AR5212 }, /* 2413 Griffin-lite */
         { PCI_VDEVICE(ATHEROS, 0x001b), .driver_data = AR5K_AR5212 }, /* 5413 Eagle */
-        { PCI_VDEVICE(ATHEROS, 0x001c), .driver_data = AR5K_AR5212 }, /* 5424 Condor (PCI-E)*/
+        { PCI_VDEVICE(ATHEROS, 0x001c), .driver_data = AR5K_AR5212 }, /* PCI-E cards */
+        { PCI_VDEVICE(ATHEROS, 0x001d), .driver_data = AR5K_AR5212 }, /* 2417 Nala */
         { 0 }
 };
 MODULE_DEVICE_TABLE(pci, ath5k_pci_id_table);
 
 /* Known SREVs */
 static struct ath5k_srev_name srev_names[] = {
-        { "5210",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5210 },
-        { "5311",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5311 },
-        { "5311A",      AR5K_VERSION_VER,       AR5K_SREV_VER_AR5311A },
-        { "5311B",      AR5K_VERSION_VER,       AR5K_SREV_VER_AR5311B },
-        { "5211",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5211 },
-        { "5212",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5212 },
-        { "5213",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5213 },
-        { "5213A",      AR5K_VERSION_VER,       AR5K_SREV_VER_AR5213A },
-        { "2413",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR2413 },
-        { "2414",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR2414 },
-        { "2424",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR2424 },
-        { "5424",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5424 },
-        { "5413",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5413 },
-        { "5414",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5414 },
-        { "5416",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5416 },
-        { "5418",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5418 },
-        { "2425",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR2425 },
-        { "xxxxx",      AR5K_VERSION_VER,       AR5K_SREV_UNKNOWN },
+        { "5210",       AR5K_VERSION_MAC,       AR5K_SREV_AR5210 },
+        { "5311",       AR5K_VERSION_MAC,       AR5K_SREV_AR5311 },
+        { "5311A",      AR5K_VERSION_MAC,       AR5K_SREV_AR5311A },
+        { "5311B",      AR5K_VERSION_MAC,       AR5K_SREV_AR5311B },
+        { "5211",       AR5K_VERSION_MAC,       AR5K_SREV_AR5211 },
+        { "5212",       AR5K_VERSION_MAC,       AR5K_SREV_AR5212 },
+        { "5213",       AR5K_VERSION_MAC,       AR5K_SREV_AR5213 },
+        { "5213A",      AR5K_VERSION_MAC,       AR5K_SREV_AR5213A },
+        { "2413",       AR5K_VERSION_MAC,       AR5K_SREV_AR2413 },
+        { "2414",       AR5K_VERSION_MAC,       AR5K_SREV_AR2414 },
+        { "5424",       AR5K_VERSION_MAC,       AR5K_SREV_AR5424 },
+        { "5413",       AR5K_VERSION_MAC,       AR5K_SREV_AR5413 },
+        { "5414",       AR5K_VERSION_MAC,       AR5K_SREV_AR5414 },
+        { "2415",       AR5K_VERSION_MAC,       AR5K_SREV_AR2415 },
+        { "5416",       AR5K_VERSION_MAC,       AR5K_SREV_AR5416 },
+        { "5418",       AR5K_VERSION_MAC,       AR5K_SREV_AR5418 },
+        { "2425",       AR5K_VERSION_MAC,       AR5K_SREV_AR2425 },
+        { "2417",       AR5K_VERSION_MAC,       AR5K_SREV_AR2417 },
+        { "xxxxx",      AR5K_VERSION_MAC,       AR5K_SREV_UNKNOWN },
         { "5110",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5110 },
         { "5111",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5111 },
+        { "5111A",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_5111A },
         { "2111",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_2111 },
         { "5112",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5112 },
         { "5112A",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_5112A },
+        { "5112B",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_5112B },
         { "2112",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_2112 },
         { "2112A",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_2112A },
-        { "SChip",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_SC0 },
-        { "SChip",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_SC1 },
-        { "SChip",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_SC2 },
+        { "2112B",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_2112B },
+        { "2413",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_2413 },
+        { "5413",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5413 },
+        { "2316",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_2316 },
+        { "2317",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_2317 },
+        { "5424",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5424 },
         { "5133",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5133 },
         { "xxxxx",      AR5K_VERSION_RAD,       AR5K_SREV_UNKNOWN },
 };
 
+static struct ieee80211_rate ath5k_rates[] = {
+        { .bitrate = 10,
+          .hw_value = ATH5K_RATE_CODE_1M, },
+        { .bitrate = 20,
+          .hw_value = ATH5K_RATE_CODE_2M,
+          .hw_value_short = ATH5K_RATE_CODE_2M | AR5K_SET_SHORT_PREAMBLE,
+          .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 55,
+          .hw_value = ATH5K_RATE_CODE_5_5M,
+          .hw_value_short = ATH5K_RATE_CODE_5_5M | AR5K_SET_SHORT_PREAMBLE,
+          .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 110,
+          .hw_value = ATH5K_RATE_CODE_11M,
+          .hw_value_short = ATH5K_RATE_CODE_11M | AR5K_SET_SHORT_PREAMBLE,
+          .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+        { .bitrate = 60,
+          .hw_value = ATH5K_RATE_CODE_6M,
+          .flags = 0 },
+        { .bitrate = 90,
+          .hw_value = ATH5K_RATE_CODE_9M,
+          .flags = 0 },
+        { .bitrate = 120,
+          .hw_value = ATH5K_RATE_CODE_12M,
+          .flags = 0 },
+        { .bitrate = 180,
+          .hw_value = ATH5K_RATE_CODE_18M,
+          .flags = 0 },
+        { .bitrate = 240,
+          .hw_value = ATH5K_RATE_CODE_24M,
+          .flags = 0 },
+        { .bitrate = 360,
+          .hw_value = ATH5K_RATE_CODE_36M,
+          .flags = 0 },
+        { .bitrate = 480,
+          .hw_value = ATH5K_RATE_CODE_48M,
+          .flags = 0 },
+        { .bitrate = 540,
+          .hw_value = ATH5K_RATE_CODE_54M,
+          .flags = 0 },
+        /* XR missing */
+};
+
 /*
  * Prototypes - PCI stack related functions
  */
@@ -162,7 +211,8 @@ static struct pci_driver ath5k_pci_driver = {
  * Prototypes - MAC 802.11 stack related functions
  */
 static int ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
-static int ath5k_reset(struct ieee80211_hw *hw);
+static int ath5k_reset(struct ath5k_softc *sc, bool stop, bool change_channel);
+static int ath5k_reset_wake(struct ath5k_softc *sc);
 static int ath5k_start(struct ieee80211_hw *hw);
 static void ath5k_stop(struct ieee80211_hw *hw);
 static int ath5k_add_interface(struct ieee80211_hw *hw,
@@ -218,20 +268,16 @@ static void 	ath5k_detach(struct pci_dev *pdev,
                         struct ieee80211_hw *hw);
 /* Channel/mode setup */
 static inline short ath5k_ieee2mhz(short chan);
-static unsigned int ath5k_copy_rates(struct ieee80211_rate *rates,
-                                const struct ath5k_rate_table *rt,
-                                unsigned int max);
 static unsigned int ath5k_copy_channels(struct ath5k_hw *ah,
                                 struct ieee80211_channel *channels,
                                 unsigned int mode,
                                 unsigned int max);
-static int      ath5k_getchannels(struct ieee80211_hw *hw);
+static int      ath5k_setup_bands(struct ieee80211_hw *hw);
 static int      ath5k_chan_set(struct ath5k_softc *sc,
                                 struct ieee80211_channel *chan);
 static void     ath5k_setcurmode(struct ath5k_softc *sc,
                                 unsigned int mode);
 static void     ath5k_mode_setup(struct ath5k_softc *sc);
-static void     ath5k_set_total_hw_rates(struct ath5k_softc *sc);
 
 /* Descriptor setup */
 static int      ath5k_desc_alloc(struct ath5k_softc *sc,
@@ -351,7 +397,11 @@ ath5k_chip_name(enum ath5k_srev_type type, u_int16_t val)
         for (i = 0; i < ARRAY_SIZE(srev_names); i++) {
                 if (srev_names[i].sr_type != type)
                         continue;
-                if ((val & 0xff) < srev_names[i + 1].sr_val) {
+
+                if ((val & 0xf0) == srev_names[i].sr_val)
+                        name = srev_names[i].sr_name;
+
+                if ((val & 0xff) == srev_names[i].sr_val) {
                         name = srev_names[i].sr_name;
                         break;
                 }
@@ -446,6 +496,12 @@ ath5k_pci_probe(struct pci_dev *pdev,
         hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
                     IEEE80211_HW_SIGNAL_DBM |
                     IEEE80211_HW_NOISE_DBM;
+
+        hw->wiphy->interface_modes =
+                BIT(NL80211_IFTYPE_STATION) |
+                BIT(NL80211_IFTYPE_ADHOC) |
+                BIT(NL80211_IFTYPE_MESH_POINT);
+
         hw->extra_tx_headroom = 2;
         hw->channel_change_time = 5000;
         sc = hw->priv;
@@ -462,7 +518,7 @@ ath5k_pci_probe(struct pci_dev *pdev,
 
         sc->iobase = mem; /* So we can unmap it on detach */
         sc->cachelsz = csz * sizeof(u32); /* convert to bytes */
-        sc->opmode = IEEE80211_IF_TYPE_STA;
+        sc->opmode = NL80211_IFTYPE_STATION;
         mutex_init(&sc->lock);
         spin_lock_init(&sc->rxbuflock);
         spin_lock_init(&sc->txbuflock);
@@ -485,13 +541,19 @@ ath5k_pci_probe(struct pci_dev *pdev,
                 goto err_irq;
         }
 
+        /* set up multi-rate retry capabilities */
+        if (sc->ah->ah_version == AR5K_AR5212) {
+                hw->max_altrates = 3;
+                hw->max_altrate_tries = 11;
+        }
+
         /* Finish private driver data initialization */
         ret = ath5k_attach(pdev, hw);
         if (ret)
                 goto err_ah;
 
         ATH5K_INFO(sc, "Atheros AR%s chip found (MAC: 0x%x, PHY: 0x%x)\n",
-                        ath5k_chip_name(AR5K_VERSION_VER,sc->ah->ah_mac_srev),
+                        ath5k_chip_name(AR5K_VERSION_MAC, sc->ah->ah_mac_srev),
                                         sc->ah->ah_mac_srev,
                                         sc->ah->ah_phy_revision);
 
@@ -646,7 +708,6 @@ err_no_irq:
 #endif /* CONFIG_PM */
 
 
-
 /***********************\
 * Driver Initialization *
 \***********************/
@@ -669,7 +730,7 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
          * return false w/o doing anything.  MAC's that do
          * support it will return true w/o doing anything.
          */
-        ret = ah->ah_setup_xtx_desc(ah, NULL, 0, 0, 0, 0, 0, 0);
+        ret = ah->ah_setup_mrr_tx_desc(ah, NULL, 0, 0, 0, 0, 0, 0);
         if (ret < 0)
                 goto err;
         if (ret > 0)
@@ -688,15 +749,12 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
          * on settings like the phy mode and regulatory
          * domain restrictions.
          */
-        ret = ath5k_getchannels(hw);
+        ret = ath5k_setup_bands(hw);
         if (ret) {
                 ATH5K_ERR(sc, "can't get channels\n");
                 goto err;
         }
 
-        /* Set *_rates so we can map hw rate index */
-        ath5k_set_total_hw_rates(sc);
-
         /* NB: setup here so ath5k_rate_update is happy */
         if (test_bit(AR5K_MODE_11A, ah->ah_modes))
                 ath5k_setcurmode(sc, AR5K_MODE_11A);
@@ -813,27 +871,6 @@ ath5k_ieee2mhz(short chan)
 }
 
 static unsigned int
-ath5k_copy_rates(struct ieee80211_rate *rates,
-                const struct ath5k_rate_table *rt,
-                unsigned int max)
-{
-        unsigned int i, count;
-
-        if (rt == NULL)
-                return 0;
-
-        for (i = 0, count = 0; i < rt->rate_count && max > 0; i++) {
-                rates[count].bitrate = rt->rates[i].rate_kbps / 100;
-                rates[count].hw_value = rt->rates[i].rate_code;
-                rates[count].flags = rt->rates[i].modulation;
-                count++;
-                max--;
-        }
-
-        return count;
-}
-
-static unsigned int
 ath5k_copy_channels(struct ath5k_hw *ah,
                 struct ieee80211_channel *channels,
                 unsigned int mode,
@@ -895,74 +932,97 @@ ath5k_copy_channels(struct ath5k_hw *ah,
         return count;
 }
 
+static void
+ath5k_setup_rate_idx(struct ath5k_softc *sc, struct ieee80211_supported_band *b)
+{
+        u8 i;
+
+        for (i = 0; i < AR5K_MAX_RATES; i++)
+                sc->rate_idx[b->band][i] = -1;
+
+        for (i = 0; i < b->n_bitrates; i++) {
+                sc->rate_idx[b->band][b->bitrates[i].hw_value] = i;
+                if (b->bitrates[i].hw_value_short)
+                        sc->rate_idx[b->band][b->bitrates[i].hw_value_short] = i;
+        }
+}
+
 static int
-ath5k_getchannels(struct ieee80211_hw *hw)
+ath5k_setup_bands(struct ieee80211_hw *hw)
 {
         struct ath5k_softc *sc = hw->priv;
         struct ath5k_hw *ah = sc->ah;
-        struct ieee80211_supported_band *sbands = sc->sbands;
-        const struct ath5k_rate_table *hw_rates;
-        unsigned int max_r, max_c, count_r, count_c;
-        int mode2g = AR5K_MODE_11G;
+        struct ieee80211_supported_band *sband;
+        int max_c, count_c = 0;
+        int i;
 
         BUILD_BUG_ON(ARRAY_SIZE(sc->sbands) < IEEE80211_NUM_BANDS);
-
-        max_r = ARRAY_SIZE(sc->rates);
         max_c = ARRAY_SIZE(sc->channels);
-        count_r = count_c = 0;
 
         /* 2GHz band */
-        if (!test_bit(AR5K_MODE_11G, sc->ah->ah_capabilities.cap_mode)) {
-                mode2g = AR5K_MODE_11B;
-                if (!test_bit(AR5K_MODE_11B,
-                        sc->ah->ah_capabilities.cap_mode))
-                        mode2g = -1;
-        }
+        sband = &sc->sbands[IEEE80211_BAND_2GHZ];
+        sband->band = IEEE80211_BAND_2GHZ;
+        sband->bitrates = &sc->rates[IEEE80211_BAND_2GHZ][0];
 
-        if (mode2g > 0) {
-                struct ieee80211_supported_band *sband =
-                        &sbands[IEEE80211_BAND_2GHZ];
+        if (test_bit(AR5K_MODE_11G, sc->ah->ah_capabilities.cap_mode)) {
+                /* G mode */
+                memcpy(sband->bitrates, &ath5k_rates[0],
+                       sizeof(struct ieee80211_rate) * 12);
+                sband->n_bitrates = 12;
 
-                sband->bitrates = sc->rates;
                 sband->channels = sc->channels;
-
-                sband->band = IEEE80211_BAND_2GHZ;
                 sband->n_channels = ath5k_copy_channels(ah, sband->channels,
-                                        mode2g, max_c);
-
-                hw_rates = ath5k_hw_get_rate_table(ah, mode2g);
-                sband->n_bitrates = ath5k_copy_rates(sband->bitrates,
-                                        hw_rates, max_r);
+                                        AR5K_MODE_11G, max_c);
 
+                hw->wiphy->bands[IEEE80211_BAND_2GHZ] = sband;
                 count_c = sband->n_channels;
-                count_r = sband->n_bitrates;
+                max_c -= count_c;
+        } else if (test_bit(AR5K_MODE_11B, sc->ah->ah_capabilities.cap_mode)) {
+                /* B mode */
+                memcpy(sband->bitrates, &ath5k_rates[0],
+                       sizeof(struct ieee80211_rate) * 4);
+                sband->n_bitrates = 4;
+
+                /* 5211 only supports B rates and uses 4bit rate codes
+                 * (e.g normally we have 0x1B for 1M, but on 5211 we have 0x0B)
+                 * fix them up here:
+                 */
+                if (ah->ah_version == AR5K_AR5211) {
+                        for (i = 0; i < 4; i++) {
+                                sband->bitrates[i].hw_value =
+                                        sband->bitrates[i].hw_value & 0xF;
+                                sband->bitrates[i].hw_value_short =
+                                        sband->bitrates[i].hw_value_short & 0xF;
+                        }
+                }
 
-                hw->wiphy->bands[IEEE80211_BAND_2GHZ] = sband;
+                sband->channels = sc->channels;
+                sband->n_channels = ath5k_copy_channels(ah, sband->channels,
+                                        AR5K_MODE_11B, max_c);
 
-                max_r -= count_r;
+                hw->wiphy->bands[IEEE80211_BAND_2GHZ] = sband;
+                count_c = sband->n_channels;
                 max_c -= count_c;
-
         }
+        ath5k_setup_rate_idx(sc, sband);
 
-        /* 5GHz band */
-
+        /* 5GHz band, A mode */
         if (test_bit(AR5K_MODE_11A, sc->ah->ah_capabilities.cap_mode)) {
-                struct ieee80211_supported_band *sband =
-                        &sbands[IEEE80211_BAND_5GHZ];
+                sband = &sc->sbands[IEEE80211_BAND_5GHZ];
+                sband->band = IEEE80211_BAND_5GHZ;
+                sband->bitrates = &sc->rates[IEEE80211_BAND_5GHZ][0];
 
-                sband->bitrates = &sc->rates[count_r];
-                sband->channels = &sc->channels[count_c];
+                memcpy(sband->bitrates, &ath5k_rates[4],
+                       sizeof(struct ieee80211_rate) * 8);
+                sband->n_bitrates = 8;
 
-                sband->band = IEEE80211_BAND_5GHZ;
+                sband->channels = &sc->channels[count_c];
                 sband->n_channels = ath5k_copy_channels(ah, sband->channels,
                                         AR5K_MODE_11A, max_c);
 
-                hw_rates = ath5k_hw_get_rate_table(ah, AR5K_MODE_11A);
-                sband->n_bitrates = ath5k_copy_rates(sband->bitrates,
-                                        hw_rates, max_r);
-
                 hw->wiphy->bands[IEEE80211_BAND_5GHZ] = sband;
         }
+        ath5k_setup_rate_idx(sc, sband);
 
         ath5k_debug_dump_bands(sc);
 
@@ -978,9 +1038,6 @@ ath5k_getchannels(struct ieee80211_hw *hw)
 static int
 ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan)
 {
-        struct ath5k_hw *ah = sc->ah;
-        int ret;
-
         ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "(%u MHz) -> (%u MHz)\n",
                 sc->curchan->center_freq, chan->center_freq);
 
@@ -996,41 +1053,7 @@ ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan)
                  * hardware at the new frequency, and then re-enable
                  * the relevant bits of the h/w.
                  */
-                ath5k_hw_set_intr(ah, 0);       /* disable interrupts */
-                ath5k_txq_cleanup(sc);          /* clear pending tx frames */
-                ath5k_rx_stop(sc);              /* turn off frame recv */
-                ret = ath5k_hw_reset(ah, sc->opmode, sc->curchan, true);
-                if (ret) {
-                        ATH5K_ERR(sc, "%s: unable to reset channel "
-                                "(%u Mhz)\n", __func__, chan->center_freq);
-                        return ret;
-                }
-
-                ath5k_hw_set_txpower_limit(sc->ah, 0);
-
-                /*
-                 * Re-enable rx framework.
-                 */
-                ret = ath5k_rx_start(sc);
-                if (ret) {
-                        ATH5K_ERR(sc, "%s: unable to restart recv logic\n",
-                                        __func__);
-                        return ret;
-                }
-
-                /*
-                 * Change channels and update the h/w rate map
-                 * if we're switching; e.g. 11a to 11b/g.
-                 *
-                 * XXX needed?
-                 */
-/*              ath5k_chan_change(sc, chan); */
-
-                ath5k_beacon_config(sc);
-                /*
-                 * Re-enable interrupts.
-                 */
-                ath5k_hw_set_intr(ah, sc->imask);
+                return ath5k_reset(sc, true, true);
         }
 
         return 0;
@@ -1068,75 +1091,13 @@ ath5k_mode_setup(struct ath5k_softc *sc)
         ATH5K_DBG(sc, ATH5K_DEBUG_MODE, "RX filter 0x%x\n", rfilt);
 }
 
-/*
- * Match the hw provided rate index (through descriptors)
- * to an index for sc->curband->bitrates, so it can be used
- * by the stack.
- *
- * This one is a little bit tricky but i think i'm right
- * about this...
- *
- * We have 4 rate tables in the following order:
- * XR (4 rates)
- * 802.11a (8 rates)
- * 802.11b (4 rates)
- * 802.11g (12 rates)
- * that make the hw rate table.
- *
- * Lets take a 5211 for example that supports a and b modes only.
- * First comes the 802.11a table and then 802.11b (total 12 rates).
- * When hw returns eg. 11 it points to the last 802.11b rate (11Mbit),
- * if it returns 2 it points to the second 802.11a rate etc.
- *
- * Same goes for 5212 who has xr/a/b/g support (total 28 rates).
- * First comes the XR table, then 802.11a, 802.11b and 802.11g.
- * When hw returns eg. 27 it points to the last 802.11g rate (54Mbits) etc
- */
-static void
-ath5k_set_total_hw_rates(struct ath5k_softc *sc) {
-
-        struct ath5k_hw *ah = sc->ah;
-
-        if (test_bit(AR5K_MODE_11A, ah->ah_modes))
-                sc->a_rates = 8;
-
-        if (test_bit(AR5K_MODE_11B, ah->ah_modes))
-                sc->b_rates = 4;
-
-        if (test_bit(AR5K_MODE_11G, ah->ah_modes))
-                sc->g_rates = 12;
-
-        /* XXX: Need to see what what happens when
-                xr disable bits in eeprom are set */
-        if (ah->ah_version >= AR5K_AR5212)
-                sc->xr_rates = 4;
-
-}
-
 static inline int
-ath5k_hw_to_driver_rix(struct ath5k_softc *sc, int hw_rix) {
-
-        int mac80211_rix;
-
-        if(sc->curband->band == IEEE80211_BAND_2GHZ) {
-                /* We setup a g ratetable for both b/g modes */
-                mac80211_rix =
-                        hw_rix - sc->b_rates - sc->a_rates - sc->xr_rates;
-        } else {
-                mac80211_rix = hw_rix - sc->xr_rates;
-        }
-
-        /* Something went wrong, fallback to basic rate for this band */
-        if ((mac80211_rix >= sc->curband->n_bitrates) ||
-                (mac80211_rix <= 0 ))
-                mac80211_rix = 1;
-
-        return mac80211_rix;
+ath5k_hw_to_driver_rix(struct ath5k_softc *sc, int hw_rix)
+{
+        WARN_ON(hw_rix < 0 || hw_rix > AR5K_MAX_RATES);
+        return sc->rate_idx[sc->curband->band][hw_rix];
 }
 
-
-
-
 /***************\
 * Buffers setup *
 \***************/
@@ -1199,7 +1160,7 @@ ath5k_rxbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)
         ds = bf->desc;
         ds->ds_link = bf->daddr;        /* link to self */
         ds->ds_data = bf->skbaddr;
-        ath5k_hw_setup_rx_desc(ah, ds,
+        ah->ah_setup_rx_desc(ah, ds,
                 skb_tailroom(skb),      /* buffer size */
                 0);
 
@@ -1218,7 +1179,9 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)
         struct sk_buff *skb = bf->skb;
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         unsigned int pktlen, flags, keyidx = AR5K_TXKEYIX_INVALID;
-        int ret;
+        struct ieee80211_rate *rate;
+        unsigned int mrr_rate[3], mrr_tries[3];
+        int i, ret;
 
         flags = AR5K_TXDESC_INTREQ | AR5K_TXDESC_CLRDMASK;
 
@@ -1233,7 +1196,7 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)
 
         if (info->control.hw_key) {
                 keyidx = info->control.hw_key->hw_key_idx;
-                pktlen += info->control.icv_len;
+                pktlen += info->control.hw_key->icv_len;
         }
         ret = ah->ah_setup_tx_desc(ah, ds, pktlen,
                 ieee80211_get_hdrlen_from_skb(skb), AR5K_PKT_TYPE_NORMAL,
@@ -1243,6 +1206,22 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)
         if (ret)
                 goto err_unmap;
 
+        memset(mrr_rate, 0, sizeof(mrr_rate));
+        memset(mrr_tries, 0, sizeof(mrr_tries));
+        for (i = 0; i < 3; i++) {
+                rate = ieee80211_get_alt_retry_rate(sc->hw, info, i);
+                if (!rate)
+                        break;
+
+                mrr_rate[i] = rate->hw_value;
+                mrr_tries[i] = info->control.retries[i].limit;
+        }
+
+        ah->ah_setup_mrr_tx_desc(ah, ds,
+                mrr_rate[0], mrr_tries[0],
+                mrr_rate[1], mrr_tries[1],
+                mrr_rate[2], mrr_tries[2]);
+
         ds->ds_link = 0;
         ds->ds_data = bf->skbaddr;
 
@@ -1250,12 +1229,12 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)
         list_add_tail(&bf->list, &txq->q);
         sc->tx_stats[txq->qnum].len++;
         if (txq->link == NULL) /* is this first packet? */
-                ath5k_hw_put_tx_buf(ah, txq->qnum, bf->daddr);
+                ath5k_hw_set_txdp(ah, txq->qnum, bf->daddr);
         else /* no, so only link it */
                 *txq->link = bf->daddr;
 
         txq->link = &ds->ds_link;
-        ath5k_hw_tx_start(ah, txq->qnum);
+        ath5k_hw_start_tx_dma(ah, txq->qnum);
         mmiowb();
         spin_unlock_bh(&txq->lock);
 
@@ -1433,7 +1412,8 @@ ath5k_beaconq_config(struct ath5k_softc *sc)
         ret = ath5k_hw_get_tx_queueprops(ah, sc->bhalq, &qi);
         if (ret)
                 return ret;
-        if (sc->opmode == IEEE80211_IF_TYPE_AP) {
+        if (sc->opmode == NL80211_IFTYPE_AP ||
+                sc->opmode == NL80211_IFTYPE_MESH_POINT) {
                 /*
                  * Always burst out beacon and CAB traffic
                  * (aifs = cwmin = cwmax = 0)
@@ -1441,7 +1421,7 @@ ath5k_beaconq_config(struct ath5k_softc *sc)
                 qi.tqi_aifs = 0;
                 qi.tqi_cw_min = 0;
                 qi.tqi_cw_max = 0;
-        } else if (sc->opmode == IEEE80211_IF_TYPE_IBSS) {
+        } else if (sc->opmode == NL80211_IFTYPE_ADHOC) {
                 /*
                  * Adhoc mode; backoff between 0 and (2 * cw_min).
                  */
@@ -1454,7 +1434,7 @@ ath5k_beaconq_config(struct ath5k_softc *sc)
                 "beacon queueprops tqi_aifs:%d tqi_cw_min:%d tqi_cw_max:%d\n",
                 qi.tqi_aifs, qi.tqi_cw_min, qi.tqi_cw_max);
 
-        ret = ath5k_hw_setup_tx_queueprops(ah, sc->bhalq, &qi);
+        ret = ath5k_hw_set_tx_queueprops(ah, sc->bhalq, &qi);
         if (ret) {
                 ATH5K_ERR(sc, "%s: unable to update parameters for beacon "
                         "hardware queue!\n", __func__);
@@ -1503,14 +1483,14 @@ ath5k_txq_cleanup(struct ath5k_softc *sc)
                 /* don't touch the hardware if marked invalid */
                 ath5k_hw_stop_tx_dma(ah, sc->bhalq);
                 ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "beacon queue %x\n",
-                        ath5k_hw_get_tx_buf(ah, sc->bhalq));
+                        ath5k_hw_get_txdp(ah, sc->bhalq));
                 for (i = 0; i < ARRAY_SIZE(sc->txqs); i++)
                         if (sc->txqs[i].setup) {
                                 ath5k_hw_stop_tx_dma(ah, sc->txqs[i].qnum);
                                 ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "txq [%u] %x, "
                                         "link %p\n",
                                         sc->txqs[i].qnum,
-                                        ath5k_hw_get_tx_buf(ah,
+                                        ath5k_hw_get_txdp(ah,
                                                         sc->txqs[i].qnum),
                                         sc->txqs[i].link);
                         }
@@ -1570,8 +1550,8 @@ ath5k_rx_start(struct ath5k_softc *sc)
         bf = list_first_entry(&sc->rxbuf, struct ath5k_buf, list);
         spin_unlock_bh(&sc->rxbuflock);
 
-        ath5k_hw_put_rx_buf(ah, bf->daddr);
-        ath5k_hw_start_rx(ah);          /* enable recv descriptors */
+        ath5k_hw_set_rxdp(ah, bf->daddr);
+        ath5k_hw_start_rx_dma(ah);      /* enable recv descriptors */
         ath5k_mode_setup(sc);           /* set filters, etc. */
         ath5k_hw_start_rx_pcu(ah);      /* re-enable PCU/DMA engine */
 
@@ -1588,7 +1568,7 @@ ath5k_rx_stop(struct ath5k_softc *sc)
 {
         struct ath5k_hw *ah = sc->ah;
 
-        ath5k_hw_stop_pcu_recv(ah);     /* disable PCU */
+        ath5k_hw_stop_rx_pcu(ah);       /* disable PCU */
         ath5k_hw_set_rx_filter(ah, 0);  /* clear recv filter */
         ath5k_hw_stop_rx_dma(ah);       /* disable DMA engine */
 
@@ -1602,7 +1582,7 @@ ath5k_rx_decrypted(struct ath5k_softc *sc, struct ath5k_desc *ds,
                 struct sk_buff *skb, struct ath5k_rx_status *rs)
 {
         struct ieee80211_hdr *hdr = (void *)skb->data;
-        unsigned int keyix, hlen = ieee80211_get_hdrlen_from_skb(skb);
+        unsigned int keyix, hlen;
 
         if (!(rs->rs_status & AR5K_RXERR_DECRYPT) &&
                         rs->rs_keyix != AR5K_RXKEYIX_INVALID)
@@ -1611,6 +1591,7 @@ ath5k_rx_decrypted(struct ath5k_softc *sc, struct ath5k_desc *ds,
         /* Apparently when a default key is used to decrypt the packet
            the hw does not set the index used to decrypt.  In such cases
            get the index from the packet. */
+        hlen = ieee80211_hdrlen(hdr->frame_control);
         if (ieee80211_has_protected(hdr->frame_control) &&
             !(rs->rs_status & AR5K_RXERR_DECRYPT) &&
             skb->len >= hlen + 4) {
@@ -1768,7 +1749,7 @@ ath5k_tasklet_rx(unsigned long data)
                         /* let crypto-error packets fall through in MNTR */
                         if ((rs.rs_status &
                                 ~(AR5K_RXERR_DECRYPT|AR5K_RXERR_MIC)) ||
-                                        sc->opmode != IEEE80211_IF_TYPE_MNTR)
+                                        sc->opmode != NL80211_IFTYPE_MONITOR)
                                 goto next;
                 }
 accept:
@@ -1824,10 +1805,14 @@ accept:
                 rxs.rate_idx = ath5k_hw_to_driver_rix(sc, rs.rs_rate);
                 rxs.flag |= ath5k_rx_decrypted(sc, ds, skb, &rs);
 
+                if (rxs.rate_idx >= 0 && rs.rs_rate ==
+                    sc->curband->bitrates[rxs.rate_idx].hw_value_short)
+                        rxs.flag |= RX_FLAG_SHORTPRE;
+
                 ath5k_debug_dump_skb(sc, skb, "RX  ", 0);
 
                 /* check beacons in IBSS mode */
-                if (sc->opmode == IEEE80211_IF_TYPE_IBSS)
+                if (sc->opmode == NL80211_IFTYPE_ADHOC)
                         ath5k_check_ibss_tsf(sc, skb, &rxs);
 
                 __ieee80211_rx(sc->hw, skb, &rxs);
@@ -1853,7 +1838,7 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)
         struct ath5k_desc *ds;
         struct sk_buff *skb;
         struct ieee80211_tx_info *info;
-        int ret;
+        int i, ret;
 
         spin_lock(&txq->lock);
         list_for_each_entry_safe(bf, bf0, &txq->q, list) {
@@ -1875,7 +1860,25 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)
                 pci_unmap_single(sc->pdev, bf->skbaddr, skb->len,
                                 PCI_DMA_TODEVICE);
 
-                info->status.retry_count = ts.ts_shortretry + ts.ts_longretry / 6;
+                memset(&info->status, 0, sizeof(info->status));
+                info->tx_rate_idx = ath5k_hw_to_driver_rix(sc,
+                                ts.ts_rate[ts.ts_final_idx]);
+                info->status.retry_count = ts.ts_longretry;
+
+                for (i = 0; i < 4; i++) {
+                        struct ieee80211_tx_altrate *r =
+                                &info->status.retries[i];
+
+                        if (ts.ts_rate[i]) {
+                                r->rate_idx = ath5k_hw_to_driver_rix(sc, ts.ts_rate[i]);
+                                r->limit = ts.ts_retry[i];
+                        } else {
+                                r->rate_idx = -1;
+                                r->limit = 0;
+                        }
+                }
+
+                info->status.excessive_retries = 0;
                 if (unlikely(ts.ts_status)) {
                         sc->ll_stats.dot11ACKFailureCount++;
                         if (ts.ts_status & AR5K_TXERR_XRETRY)
@@ -1942,7 +1945,7 @@ ath5k_beacon_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)
         ds = bf->desc;
 
         flags = AR5K_TXDESC_NOACK;
-        if (sc->opmode == IEEE80211_IF_TYPE_IBSS && ath5k_hw_hasveol(ah)) {
+        if (sc->opmode == NL80211_IFTYPE_ADHOC && ath5k_hw_hasveol(ah)) {
                 ds->ds_link = bf->daddr;        /* self-linked */
                 flags |= AR5K_TXDESC_VEOL;
                 /*
@@ -1991,8 +1994,8 @@ ath5k_beacon_send(struct ath5k_softc *sc)
 
         ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, "in beacon_send\n");
 
-        if (unlikely(bf->skb == NULL || sc->opmode == IEEE80211_IF_TYPE_STA ||
-                        sc->opmode == IEEE80211_IF_TYPE_MNTR)) {
+        if (unlikely(bf->skb == NULL || sc->opmode == NL80211_IFTYPE_STATION ||
+                        sc->opmode == NL80211_IFTYPE_MONITOR)) {
                 ATH5K_WARN(sc, "bf=%p bf_skb=%p\n", bf, bf ? bf->skb : NULL);
                 return;
         }
@@ -2032,8 +2035,8 @@ ath5k_beacon_send(struct ath5k_softc *sc)
                 /* NB: hw still stops DMA, so proceed */
         }
 
-        ath5k_hw_put_tx_buf(ah, sc->bhalq, bf->daddr);
-        ath5k_hw_tx_start(ah, sc->bhalq);
+        ath5k_hw_set_txdp(ah, sc->bhalq, bf->daddr);
+        ath5k_hw_start_tx_dma(ah, sc->bhalq);
         ATH5K_DBG(sc, ATH5K_DEBUG_BEACON, "TXDP[%u] = %llx (%p)\n",
                 sc->bhalq, (unsigned long long)bf->daddr, bf->desc);
 
@@ -2162,13 +2165,13 @@ ath5k_beacon_config(struct ath5k_softc *sc)
 {
         struct ath5k_hw *ah = sc->ah;
 
-        ath5k_hw_set_intr(ah, 0);
+        ath5k_hw_set_imr(ah, 0);
         sc->bmisscount = 0;
         sc->imask &= ~(AR5K_INT_BMISS | AR5K_INT_SWBA);
 
-        if (sc->opmode == IEEE80211_IF_TYPE_STA) {
+        if (sc->opmode == NL80211_IFTYPE_STATION) {
                 sc->imask |= AR5K_INT_BMISS;
-        } else if (sc->opmode == IEEE80211_IF_TYPE_IBSS) {
+        } else if (sc->opmode == NL80211_IFTYPE_ADHOC) {
                 /*
                  * In IBSS mode we use a self-linked tx descriptor and let the
                  * hardware send the beacons automatically. We have to load it
@@ -2188,7 +2191,7 @@ ath5k_beacon_config(struct ath5k_softc *sc)
         }
         /* TODO else AP */
 
-        ath5k_hw_set_intr(ah, sc->imask);
+        ath5k_hw_set_imr(ah, sc->imask);
 }
 
 
@@ -2220,36 +2223,13 @@ ath5k_init(struct ath5k_softc *sc)
          */
         sc->curchan = sc->hw->conf.channel;
         sc->curband = &sc->sbands[sc->curchan->band];
-        ret = ath5k_hw_reset(sc->ah, sc->opmode, sc->curchan, false);
-        if (ret) {
-                ATH5K_ERR(sc, "unable to reset hardware: %d\n", ret);
-                goto done;
-        }
-        /*
-         * This is needed only to setup initial state
-         * but it's best done after a reset.
-         */
-        ath5k_hw_set_txpower_limit(sc->ah, 0);
-
-        /*
-         * Setup the hardware after reset: the key cache
-         * is filled as needed and 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.
-         */
-        ret = ath5k_rx_start(sc);
-        if (ret)
-                goto done;
-
-        /*
-         * Enable interrupts.
-         */
         sc->imask = AR5K_INT_RX | AR5K_INT_TX | AR5K_INT_RXEOL |
                 AR5K_INT_RXORN | AR5K_INT_FATAL | AR5K_INT_GLOBAL |
                 AR5K_INT_MIB;
+        ret = ath5k_reset(sc, false, false);
+        if (ret)
+                goto done;
 
-        ath5k_hw_set_intr(sc->ah, sc->imask);
         /* Set ack to be sent at low bit-rates */
         ath5k_hw_set_ack_bitrate_high(sc->ah, false);
 
@@ -2290,7 +2270,7 @@ ath5k_stop_locked(struct ath5k_softc *sc)
 
         if (!test_bit(ATH_STAT_INVALID, sc->status)) {
                 ath5k_led_off(sc);
-                ath5k_hw_set_intr(ah, 0);
+                ath5k_hw_set_imr(ah, 0);
                 synchronize_irq(sc->pdev->irq);
         }
         ath5k_txq_cleanup(sc);
@@ -2396,7 +2376,7 @@ ath5k_intr(int irq, void *dev_id)
                                 * transmission time) in order to detect wether
                                 * automatic TSF updates happened.
                                 */
-                                if (sc->opmode == IEEE80211_IF_TYPE_IBSS) {
+                                if (sc->opmode == NL80211_IFTYPE_ADHOC) {
                                          /* XXX: only if VEOL suppported */
                                         u64 tsf = ath5k_hw_get_tsf64(ah);
                                         sc->nexttbtt += sc->bintval;
@@ -2451,7 +2431,7 @@ ath5k_tasklet_reset(unsigned long data)
 {
         struct ath5k_softc *sc = (void *)data;
 
-        ath5k_reset(sc->hw);
+        ath5k_reset_wake(sc);
 }
 
 /*
@@ -2474,7 +2454,7 @@ ath5k_calibrate(unsigned long data)
                  * to load new gain values.
                  */
                 ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "calibration, resetting\n");
-                ath5k_reset(sc->hw);
+                ath5k_reset_wake(sc);
         }
         if (ath5k_hw_phy_calibrate(ah, sc->curchan))
                 ATH5K_ERR(sc, "calibration of channel %u failed\n",
@@ -2626,7 +2606,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 
         ath5k_debug_dump_skb(sc, skb, "TX  ", 1);
 
-        if (sc->opmode == IEEE80211_IF_TYPE_MNTR)
+        if (sc->opmode == NL80211_IFTYPE_MONITOR)
                 ATH5K_DBG(sc, ATH5K_DEBUG_XMIT, "tx in monitor (scan?)\n");
 
         /*
@@ -2675,48 +2655,67 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 }
 
 static int
-ath5k_reset(struct ieee80211_hw *hw)
+ath5k_reset(struct ath5k_softc *sc, bool stop, bool change_channel)
 {
-        struct ath5k_softc *sc = hw->priv;
         struct ath5k_hw *ah = sc->ah;
         int ret;
 
         ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "resetting\n");
 
-        ath5k_hw_set_intr(ah, 0);
-        ath5k_txq_cleanup(sc);
-        ath5k_rx_stop(sc);
-
+        if (stop) {
+                ath5k_hw_set_imr(ah, 0);
+                ath5k_txq_cleanup(sc);
+                ath5k_rx_stop(sc);
+        }
         ret = ath5k_hw_reset(ah, sc->opmode, sc->curchan, true);
-        if (unlikely(ret)) {
+        if (ret) {
                 ATH5K_ERR(sc, "can't reset hardware (%d)\n", ret);
                 goto err;
         }
+
+        /*
+         * This is needed only to setup initial state
+         * but it's best done after a reset.
+         */
         ath5k_hw_set_txpower_limit(sc->ah, 0);
 
         ret = ath5k_rx_start(sc);
-        if (unlikely(ret)) {
+        if (ret) {
                 ATH5K_ERR(sc, "can't start recv logic\n");
                 goto err;
         }
+
         /*
-         * We may be doing a reset in response to an ioctl
-         * that changes the channel so update any state that
-         * might change as a result.
+         * Change channels and update the h/w rate map if we're switching;
+         * e.g. 11a to 11b/g.
+         *
+         * We may be doing a reset in response to an ioctl that changes the
+         * channel so update any state that might change as a result.
          *
          * XXX needed?
          */
 /*      ath5k_chan_change(sc, c); */
-        ath5k_beacon_config(sc);
-        /* intrs are started by ath5k_beacon_config */
 
-        ieee80211_wake_queues(hw);
+        ath5k_beacon_config(sc);
+        /* intrs are enabled by ath5k_beacon_config */
 
         return 0;
 err:
         return ret;
 }
 
+static int
+ath5k_reset_wake(struct ath5k_softc *sc)
+{
+        int ret;
+
+        ret = ath5k_reset(sc, true, true);
+        if (!ret)
+                ieee80211_wake_queues(sc->hw);
+
+        return ret;
+}
+
 static int ath5k_start(struct ieee80211_hw *hw)
 {
         return ath5k_init(hw->priv);
@@ -2742,9 +2741,9 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
         sc->vif = conf->vif;
 
         switch (conf->type) {
-        case IEEE80211_IF_TYPE_STA:
-        case IEEE80211_IF_TYPE_IBSS:
-        case IEEE80211_IF_TYPE_MNTR:
+        case NL80211_IFTYPE_STATION:
+        case NL80211_IFTYPE_ADHOC:
+        case NL80211_IFTYPE_MONITOR:
                 sc->opmode = conf->type;
                 break;
         default:
@@ -2815,7 +2814,7 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         }
 
         if (conf->changed & IEEE80211_IFCC_BEACON &&
-            vif->type == IEEE80211_IF_TYPE_IBSS) {
+            vif->type == NL80211_IFTYPE_ADHOC) {
                 struct sk_buff *beacon = ieee80211_beacon_get(hw, vif);
                 if (!beacon) {
                         ret = -ENOMEM;
@@ -2827,7 +2826,7 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 
         mutex_unlock(&sc->lock);
 
-        return ath5k_reset(hw);
+        return ath5k_reset_wake(sc);
 unlock:
         mutex_unlock(&sc->lock);
         return ret;
@@ -2934,16 +2933,17 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
 
         /* XXX move these to mac80211, and add a beacon IFF flag to mac80211 */
 
-        if (sc->opmode == IEEE80211_IF_TYPE_MNTR)
+        if (sc->opmode == NL80211_IFTYPE_MONITOR)
                 rfilt |= AR5K_RX_FILTER_CONTROL | AR5K_RX_FILTER_BEACON |
                         AR5K_RX_FILTER_PROBEREQ | AR5K_RX_FILTER_PROM;
-        if (sc->opmode != IEEE80211_IF_TYPE_STA)
+        if (sc->opmode != NL80211_IFTYPE_STATION)
                 rfilt |= AR5K_RX_FILTER_PROBEREQ;
-        if (sc->opmode != IEEE80211_IF_TYPE_AP &&
+        if (sc->opmode != NL80211_IFTYPE_AP &&
+                sc->opmode != NL80211_IFTYPE_MESH_POINT &&
                 test_bit(ATH_STAT_PROMISC, sc->status))
                 rfilt |= AR5K_RX_FILTER_PROM;
-        if (sc->opmode == IEEE80211_IF_TYPE_STA ||
-                sc->opmode == IEEE80211_IF_TYPE_IBSS) {
+        if (sc->opmode == NL80211_IFTYPE_STATION ||
+                sc->opmode == NL80211_IFTYPE_ADHOC) {
                 rfilt |= AR5K_RX_FILTER_BEACON;
         }
 
@@ -3048,7 +3048,7 @@ ath5k_reset_tsf(struct ieee80211_hw *hw)
          * in IBSS mode we need to update the beacon timers too.
          * this will also reset the TSF if we call it with 0
          */
-        if (sc->opmode == IEEE80211_IF_TYPE_IBSS)
+        if (sc->opmode == NL80211_IFTYPE_ADHOC)
                 ath5k_beacon_update_timers(sc, 0);
         else
                 ath5k_hw_reset_tsf(sc->ah);
@@ -3063,7 +3063,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)
 
         ath5k_debug_dump_skb(sc, skb, "BC  ", 1);
 
-        if (sc->opmode != IEEE80211_IF_TYPE_IBSS) {
+        if (sc->opmode != NL80211_IFTYPE_ADHOC) {
                 ret = -EIO;
                 goto end;
         }