3 files changed, 5 insertions, 6 deletions

diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index 2f4b48e6fb03..e5cceb077574 100644
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -20,7 +20,6 @@
 
 /* Common calibration code */
 
-#define ATH9K_NF_TOO_HIGH       -60
 
 static int16_t ath9k_hw_get_nf_hist_mid(int16_t *nfCalBuffer)
 {
@@ -346,10 +345,10 @@ static void ath9k_hw_nf_sanitize(struct ath_hw *ah, s16 *nf)
                         "NF calibrated [%s] [chain %d] is %d\n",
                         (i >= 3 ? "ext" : "ctl"), i % 3, nf[i]);
 
-                if (nf[i] > ATH9K_NF_TOO_HIGH) {
+                if (nf[i] > limit->max) {
                         ath_dbg(common, CALIBRATE,
                                 "NF[%d] (%d) > MAX (%d), correcting to MAX\n",
-                                i, nf[i], ATH9K_NF_TOO_HIGH);
+                                i, nf[i], limit->max);
                         nf[i] = limit->max;
                 } else if (nf[i] < limit->min) {
                         ath_dbg(common, CALIBRATE,
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 60159f4ee532..cb006458fc4b 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -680,7 +680,7 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
         hw->queues = 4;
         hw->max_rates = 4;
         hw->channel_change_time = 5000;
-        hw->max_listen_interval = 10;
+        hw->max_listen_interval = 1;
         hw->max_rate_tries = 10;
         hw->sta_data_size = sizeof(struct ath_node);
         hw->vif_data_size = sizeof(struct ath_vif);
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index f4ae3ba994a8..1c4583c7ff7c 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -1913,13 +1913,13 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                 if (sc->rx.frag) {
                         int space = skb->len - skb_tailroom(hdr_skb);
 
-                        sc->rx.frag = NULL;
-
                         if (pskb_expand_head(hdr_skb, 0, space, GFP_ATOMIC) < 0) {
                                 dev_kfree_skb(skb);
                                 goto requeue_drop_frag;
                         }
 
+                        sc->rx.frag = NULL;
+
                         skb_copy_from_linear_data(skb, skb_put(hdr_skb, skb->len),
                                                   skb->len);
                         dev_kfree_skb_any(skb);