4 files changed, 14 insertions, 24 deletions

diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c
index aec33cc207fd..8e8bcc7a4805 100644
--- a/drivers/net/wireless/ath/ath5k/ahb.c
+++ b/drivers/net/wireless/ath/ath5k/ahb.c
@@ -236,17 +236,4 @@ static struct platform_driver ath_ahb_driver = {
         },
 };
 
-static int __init
-ath5k_ahb_init(void)
-{
-        return platform_driver_register(&ath_ahb_driver);
-}
-
-static void __exit
-ath5k_ahb_exit(void)
-{
-        platform_driver_unregister(&ath_ahb_driver);
-}
-
-module_init(ath5k_ahb_init);
-module_exit(ath5k_ahb_exit);
+module_platform_driver(ath_ahb_driver);
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 9f31cfa56cc0..2fd5bab2e22a 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -511,8 +511,9 @@ ath5k_update_bssid_mask_and_opmode(struct ath5k_hw *ah,
                 ath5k_vif_iter(&iter_data, vif->addr, vif);
 
         /* Get list of all active MAC addresses */
-        ieee80211_iterate_active_interfaces_atomic(ah->hw, ath5k_vif_iter,
-                                                   &iter_data);
+        ieee80211_iterate_active_interfaces_atomic(
+                ah->hw, IEEE80211_IFACE_ITER_RESUME_ALL,
+                ath5k_vif_iter, &iter_data);
         memcpy(ah->bssidmask, iter_data.mask, ETH_ALEN);
 
         ah->opmode = iter_data.opmode;
@@ -1348,7 +1349,7 @@ ath5k_receive_frame(struct ath5k_hw *ah, struct sk_buff *skb,
          * right now, so it's not too bad...
          */
         rxs->mactime = ath5k_extend_tsf(ah, rs->rs_tstamp);
-        rxs->flag |= RX_FLAG_MACTIME_MPDU;
+        rxs->flag |= RX_FLAG_MACTIME_START;
 
         rxs->freq = ah->curchan->center_freq;
         rxs->band = ah->curchan->band;
@@ -3045,8 +3046,9 @@ ath5k_any_vif_assoc(struct ath5k_hw *ah)
         iter_data.need_set_hw_addr = false;
         iter_data.found_active = true;
 
-        ieee80211_iterate_active_interfaces_atomic(ah->hw, ath5k_vif_iter,
-                                                   &iter_data);
+        ieee80211_iterate_active_interfaces_atomic(
+                ah->hw, IEEE80211_IFACE_ITER_RESUME_ALL,
+                ath5k_vif_iter, &iter_data);
         return iter_data.any_assoc;
 }
 
diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
index 7a28538e6e05..1ea8c8795c8e 100644
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
@@ -452,8 +452,9 @@ ath5k_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags,
         iter_data.hw_macaddr = NULL;
         iter_data.n_stas = 0;
         iter_data.need_set_hw_addr = false;
-        ieee80211_iterate_active_interfaces_atomic(ah->hw, ath5k_vif_iter,
-                                                   &iter_data);
+        ieee80211_iterate_active_interfaces_atomic(
+                ah->hw, IEEE80211_IFACE_ITER_RESUME_ALL,
+                ath5k_vif_iter, &iter_data);
 
         /* Set up RX Filter */
         if (iter_data.n_stas > 1) {
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index 0c2dd4771c36..4084b1076286 100644
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -789,9 +789,9 @@ ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)
                  * (I don't think it supports 44MHz) */
                 /* On 2425 initvals TURBO_SHORT is not present */
                 if (ah->ah_bwmode == AR5K_BWMODE_40MHZ) {
-                        turbo = AR5K_PHY_TURBO_MODE |
-                                (ah->ah_radio == AR5K_RF2425) ? 0 :
-                                AR5K_PHY_TURBO_SHORT;
+                        turbo = AR5K_PHY_TURBO_MODE;
+                        if (ah->ah_radio != AR5K_RF2425)
+                                turbo |= AR5K_PHY_TURBO_SHORT;
                 } else if (ah->ah_bwmode != AR5K_BWMODE_DEFAULT) {
                         if (ah->ah_radio == AR5K_RF5413) {
                                 mode |= (ah->ah_bwmode == AR5K_BWMODE_10MHZ) ?