X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9c731309dbdff1f374ec6c14799450523965fd79..a6ff6c1f36b886b61a08ac89996ee15340e6fc64:/package/mac80211/patches/300-pending_work.patch

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index f06e9df99..2b457197c 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -1,619 +1,981 @@
---- a/net/wireless/reg.c
-+++ b/net/wireless/reg.c
-@@ -1456,7 +1456,8 @@ static void reg_process_hint(struct regu
- 	 * We only time out user hints, given that they should be the only
- 	 * source of bogus requests.
- 	 */
--	if (reg_request->initiator == NL80211_REGDOM_SET_BY_USER)
-+	if (r != -EALREADY &&
-+	    reg_request->initiator == NL80211_REGDOM_SET_BY_USER)
- 		schedule_delayed_work(&reg_timeout, msecs_to_jiffies(3142));
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -320,6 +320,10 @@ static void b43_wireless_core_exit(struc
+ static int b43_wireless_core_init(struct b43_wldev *dev);
+ static struct b43_wldev * b43_wireless_core_stop(struct b43_wldev *dev);
+ static int b43_wireless_core_start(struct b43_wldev *dev);
++static void b43_op_bss_info_changed(struct ieee80211_hw *hw,
++				    struct ieee80211_vif *vif,
++				    struct ieee80211_bss_conf *conf,
++				    u32 changed);
+ 
+ static int b43_ratelimit(struct b43_wl *wl)
+ {
+@@ -3754,14 +3758,24 @@ static int b43_op_config(struct ieee8021
+ 	struct ieee80211_conf *conf = &hw->conf;
+ 	int antenna;
+ 	int err = 0;
++	bool reload_bss = false;
+ 
+ 	mutex_lock(&wl->mutex);
+ 
++	dev = wl->current_dev;
++
+ 	/* Switch the band (if necessary). This might change the active core. */
+ 	err = b43_switch_band(wl, conf->channel);
+ 	if (err)
+ 		goto out_unlock_mutex;
+-	dev = wl->current_dev;
++
++	/* Need to reload all settings if the core changed */
++	if (dev != wl->current_dev) {
++		dev = wl->current_dev;
++		changed = ~0;
++		reload_bss = true;
++	}
++
+ 	phy = &dev->phy;
+ 
+ 	if (conf_is_ht(conf))
+@@ -3822,6 +3836,9 @@ out_mac_enable:
+ out_unlock_mutex:
+ 	mutex_unlock(&wl->mutex);
+ 
++	if (wl->vif && reload_bss)
++		b43_op_bss_info_changed(hw, wl->vif, &wl->vif->bss_conf, ~0);
++
+ 	return err;
  }
  
---- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-@@ -18,13 +18,13 @@
- #include "hw-ops.h"
- #include "ar9003_phy.h"
- 
--#define MPASS	3
- #define MAX_MEASUREMENT	8
--#define MAX_DIFFERENCE	10
-+#define MAX_MAG_DELTA	11
-+#define MAX_PHS_DELTA	10
- 
- struct coeff {
--	int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MPASS];
--	int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT][MPASS];
-+	int mag_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
-+	int phs_coeff[AR9300_MAX_CHAINS][MAX_MEASUREMENT];
- 	int iqc_coeff[2];
- };
+@@ -3910,7 +3927,8 @@ static void b43_op_bss_info_changed(stru
+ 	if (changed & BSS_CHANGED_BEACON_INT &&
+ 	    (b43_is_mode(wl, NL80211_IFTYPE_AP) ||
+ 	     b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT) ||
+-	     b43_is_mode(wl, NL80211_IFTYPE_ADHOC)))
++	     b43_is_mode(wl, NL80211_IFTYPE_ADHOC)) &&
++	    conf->beacon_int)
+ 		b43_set_beacon_int(dev, conf->beacon_int);
+ 
+ 	if (changed & BSS_CHANGED_BASIC_RATES)
+@@ -4691,6 +4709,9 @@ static int b43_op_add_interface(struct i
+  out_mutex_unlock:
+ 	mutex_unlock(&wl->mutex);
+ 
++	if (err == 0)
++		b43_op_bss_info_changed(hw, vif, &vif->bss_conf, ~0);
++
+ 	return err;
+ }
+ 
+@@ -4761,6 +4782,9 @@ static int b43_op_start(struct ieee80211
+  out_mutex_unlock:
+ 	mutex_unlock(&wl->mutex);
  
-@@ -608,36 +608,48 @@ static bool ar9003_hw_calc_iq_corr(struc
- 	return true;
++	/* reload configuration */
++	b43_op_config(hw, ~0);
++
+ 	return err;
+ }
+ 
+@@ -4917,10 +4941,18 @@ out:
+ 	if (err)
+ 		wl->current_dev = NULL; /* Failed to init the dev. */
+ 	mutex_unlock(&wl->mutex);
+-	if (err)
++
++	if (err) {
+ 		b43err(wl, "Controller restart FAILED\n");
+-	else
+-		b43info(wl, "Controller restarted\n");
++		return;
++	}
++
++	/* reload configuration */
++	b43_op_config(wl->hw, ~0);
++	if (wl->vif)
++		b43_op_bss_info_changed(wl->hw, wl->vif, &wl->vif->bss_conf, ~0);
++
++	b43info(wl, "Controller restarted\n");
  }
  
--static bool ar9003_hw_compute_closest_pass_and_avg(int *mp_coeff, int *mp_avg)
-+static void ar9003_hw_detect_outlier(int *mp_coeff, int nmeasurement,
-+				     int max_delta)
+ static int b43_setup_bands(struct b43_wldev *dev,
+--- a/net/mac80211/agg-rx.c
++++ b/net/mac80211/agg-rx.c
+@@ -184,6 +184,8 @@ static void ieee80211_send_addba_resp(st
+ 		memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
+ 	else if (sdata->vif.type == NL80211_IFTYPE_STATION)
+ 		memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
++	else if (sdata->vif.type == NL80211_IFTYPE_WDS)
++		memcpy(mgmt->bssid, da, ETH_ALEN);
+ 
+ 	mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+ 					  IEEE80211_STYPE_ACTION);
+--- a/net/mac80211/agg-tx.c
++++ b/net/mac80211/agg-tx.c
+@@ -79,7 +79,8 @@ static void ieee80211_send_addba_request
+ 	memcpy(mgmt->da, da, ETH_ALEN);
+ 	memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
+ 	if (sdata->vif.type == NL80211_IFTYPE_AP ||
+-	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
++	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
++	    sdata->vif.type == NL80211_IFTYPE_WDS)
+ 		memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
+ 	else if (sdata->vif.type == NL80211_IFTYPE_STATION)
+ 		memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
+@@ -398,7 +399,8 @@ int ieee80211_start_tx_ba_session(struct
+ 	 */
+ 	if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+ 	    sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
+-	    sdata->vif.type != NL80211_IFTYPE_AP)
++	    sdata->vif.type != NL80211_IFTYPE_AP &&
++	    sdata->vif.type != NL80211_IFTYPE_WDS)
+ 		return -EINVAL;
+ 
+ 	if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) {
+--- a/net/mac80211/debugfs_sta.c
++++ b/net/mac80211/debugfs_sta.c
+@@ -59,7 +59,7 @@ static ssize_t sta_flags_read(struct fil
+ 	char buf[100];
+ 	struct sta_info *sta = file->private_data;
+ 	u32 staflags = get_sta_flags(sta);
+-	int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s",
++	int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s",
+ 		staflags & WLAN_STA_AUTH ? "AUTH\n" : "",
+ 		staflags & WLAN_STA_ASSOC ? "ASSOC\n" : "",
+ 		staflags & WLAN_STA_PS_STA ? "PS (sta)\n" : "",
+@@ -67,7 +67,6 @@ static ssize_t sta_flags_read(struct fil
+ 		staflags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",
+ 		staflags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",
+ 		staflags & WLAN_STA_WME ? "WME\n" : "",
+-		staflags & WLAN_STA_WDS ? "WDS\n" : "",
+ 		staflags & WLAN_STA_MFP ? "MFP\n" : "");
+ 	return simple_read_from_buffer(userbuf, count, ppos, buf, res);
+ }
+--- a/net/mac80211/iface.c
++++ b/net/mac80211/iface.c
+@@ -178,7 +178,6 @@ static int ieee80211_do_open(struct net_
  {
--	int diff[MPASS];
+ 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+ 	struct ieee80211_local *local = sdata->local;
+-	struct sta_info *sta;
+ 	u32 changed = 0;
+ 	int res;
+ 	u32 hw_reconf_flags = 0;
+@@ -290,27 +289,6 @@ static int ieee80211_do_open(struct net_
+ 
+ 	set_bit(SDATA_STATE_RUNNING, &sdata->state);
+ 
+-	if (sdata->vif.type == NL80211_IFTYPE_WDS) {
+-		/* Create STA entry for the WDS peer */
+-		sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
+-				     GFP_KERNEL);
+-		if (!sta) {
+-			res = -ENOMEM;
+-			goto err_del_interface;
+-		}
+-
+-		/* no locking required since STA is not live yet */
+-		sta->flags |= WLAN_STA_AUTHORIZED;
 -
--	diff[0] = abs(mp_coeff[0] - mp_coeff[1]);
--	diff[1] = abs(mp_coeff[1] - mp_coeff[2]);
--	diff[2] = abs(mp_coeff[2] - mp_coeff[0]);
+-		res = sta_info_insert(sta);
+-		if (res) {
+-			/* STA has been freed */
+-			goto err_del_interface;
+-		}
 -
--	if (diff[0] > MAX_DIFFERENCE &&
--	    diff[1] > MAX_DIFFERENCE &&
--	    diff[2] > MAX_DIFFERENCE)
--		return false;
+-		rate_control_rate_init(sta);
+-	}
 -
--	if (diff[0] <= diff[1] && diff[0] <= diff[2])
--		*mp_avg = (mp_coeff[0] + mp_coeff[1]) / 2;
--	else if (diff[1] <= diff[2])
--		*mp_avg = (mp_coeff[1] + mp_coeff[2]) / 2;
--	else
--		*mp_avg = (mp_coeff[2] + mp_coeff[0]) / 2;
-+	int mp_max = -64, max_idx = 0;
-+	int mp_min = 63, min_idx = 0;
-+	int mp_avg = 0, i, outlier_idx = 0;
-+
-+	/* find min/max mismatch across all calibrated gains */
-+	for (i = 0; i < nmeasurement; i++) {
-+		mp_avg += mp_coeff[i];
-+		if (mp_coeff[i] > mp_max) {
-+			mp_max = mp_coeff[i];
-+			max_idx = i;
-+		} else if (mp_coeff[i] < mp_min) {
-+			mp_min = mp_coeff[i];
-+			min_idx = i;
-+		}
-+	}
+ 	/*
+ 	 * set_multicast_list will be invoked by the networking core
+ 	 * which will check whether any increments here were done in
+@@ -344,8 +322,7 @@ static int ieee80211_do_open(struct net_
+ 	netif_tx_start_all_queues(dev);
+ 
+ 	return 0;
+- err_del_interface:
+-	drv_remove_interface(local, &sdata->vif);
++
+  err_stop:
+ 	if (!local->open_count)
+ 		drv_stop(local);
+@@ -718,6 +695,70 @@ static void ieee80211_if_setup(struct ne
+ 	dev->destructor = free_netdev;
+ }
  
--	return true;
-+	/* find average (exclude max abs value) */
-+	for (i = 0; i < nmeasurement; i++) {
-+		if ((abs(mp_coeff[i]) < abs(mp_max)) ||
-+		    (abs(mp_coeff[i]) < abs(mp_min)))
-+			mp_avg += mp_coeff[i];
++static void ieee80211_wds_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
++					 struct sk_buff *skb)
++{
++	struct ieee80211_local *local = sdata->local;
++	struct ieee80211_rx_status *rx_status;
++	struct ieee802_11_elems elems;
++	struct ieee80211_mgmt *mgmt;
++	struct sta_info *sta;
++	size_t baselen;
++	u32 rates = 0;
++	u16 stype;
++	bool new = false;
++	enum ieee80211_band band = local->hw.conf.channel->band;
++	struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
++
++	rx_status = IEEE80211_SKB_RXCB(skb);
++	mgmt = (struct ieee80211_mgmt *) skb->data;
++	stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
++
++	if (stype != IEEE80211_STYPE_BEACON)
++		return;
++
++	baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
++	if (baselen > skb->len)
++		return;
++
++	ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
++			       skb->len - baselen, &elems);
++
++	rates = ieee80211_sta_get_rates(local, &elems, band);
++
++	rcu_read_lock();
++
++	sta = sta_info_get(sdata, sdata->u.wds.remote_addr);
++
++	if (!sta) {
++		rcu_read_unlock();
++		sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
++				     GFP_KERNEL);
++		if (!sta)
++			return;
++
++		new = true;
 +	}
-+	mp_avg /= (nmeasurement - 1);
-+
-+	/* detect outlier */
-+	if (abs(mp_max - mp_min) > max_delta) {
-+		if (abs(mp_max - mp_avg) > abs(mp_min - mp_avg))
-+			outlier_idx = max_idx;
-+		else
-+			outlier_idx = min_idx;
++
++	sta->last_rx = jiffies;
++	sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
++
++	if (elems.ht_cap_elem)
++		ieee80211_ht_cap_ie_to_sta_ht_cap(sband,
++				elems.ht_cap_elem, &sta->sta.ht_cap);
++
++	if (elems.wmm_param)
++		set_sta_flags(sta, WLAN_STA_WME);
++
++	if (new) {
++		sta->flags = WLAN_STA_AUTHORIZED;
++		rate_control_rate_init(sta);
++		sta_info_insert_rcu(sta);
 +	}
-+	mp_coeff[outlier_idx] = mp_avg;
- }
++
++	rcu_read_unlock();
++}
++
+ static void ieee80211_iface_work(struct work_struct *work)
+ {
+ 	struct ieee80211_sub_if_data *sdata =
+@@ -822,6 +863,9 @@ static void ieee80211_iface_work(struct 
+ 				break;
+ 			ieee80211_mesh_rx_queued_mgmt(sdata, skb);
+ 			break;
++		case NL80211_IFTYPE_WDS:
++			ieee80211_wds_rx_queued_mgmt(sdata, skb);
++			break;
+ 		default:
+ 			WARN(1, "frame for unexpected interface type");
+ 			break;
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -2147,7 +2147,8 @@ ieee80211_rx_h_action(struct ieee80211_r
+ 		 */
+ 		if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+ 		    sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
+-		    sdata->vif.type != NL80211_IFTYPE_AP)
++		    sdata->vif.type != NL80211_IFTYPE_AP &&
++		    sdata->vif.type != NL80211_IFTYPE_WDS)
+ 			break;
+ 
+ 		/* verify action_code is present */
+@@ -2345,13 +2346,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
+ 
+ 	if (!ieee80211_vif_is_mesh(&sdata->vif) &&
+ 	    sdata->vif.type != NL80211_IFTYPE_ADHOC &&
+-	    sdata->vif.type != NL80211_IFTYPE_STATION)
++	    sdata->vif.type != NL80211_IFTYPE_STATION &&
++	    sdata->vif.type != NL80211_IFTYPE_WDS)
+ 		return RX_DROP_MONITOR;
+ 
+ 	switch (stype) {
+ 	case cpu_to_le16(IEEE80211_STYPE_BEACON):
+ 	case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
+-		/* process for all: mesh, mlme, ibss */
++		/* process for all: mesh, mlme, ibss, wds */
+ 		break;
+ 	case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
+ 	case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
+@@ -2692,10 +2694,16 @@ static int prepare_for_handlers(struct i
+ 		}
+ 		break;
+ 	case NL80211_IFTYPE_WDS:
+-		if (bssid || !ieee80211_is_data(hdr->frame_control))
+-			return 0;
+ 		if (compare_ether_addr(sdata->u.wds.remote_addr, hdr->addr2))
+ 			return 0;
++
++		if (ieee80211_is_data(hdr->frame_control) ||
++		    ieee80211_is_action(hdr->frame_control)) {
++			if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
++				return 0;
++		} else if (!ieee80211_is_beacon(hdr->frame_control))
++			return 0;
++
+ 		break;
+ 	default:
+ 		/* should never get here */
+--- a/net/mac80211/sta_info.h
++++ b/net/mac80211/sta_info.h
+@@ -31,7 +31,6 @@
+  *	frames.
+  * @WLAN_STA_ASSOC_AP: We're associated to that station, it is an AP.
+  * @WLAN_STA_WME: Station is a QoS-STA.
+- * @WLAN_STA_WDS: Station is one of our WDS peers.
+  * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
+  *	IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
+  *	frame to this station is transmitted.
+@@ -54,7 +53,6 @@ enum ieee80211_sta_info_flags {
+ 	WLAN_STA_SHORT_PREAMBLE	= 1<<4,
+ 	WLAN_STA_ASSOC_AP	= 1<<5,
+ 	WLAN_STA_WME		= 1<<6,
+-	WLAN_STA_WDS		= 1<<7,
+ 	WLAN_STA_CLEAR_PS_FILT	= 1<<9,
+ 	WLAN_STA_MFP		= 1<<10,
+ 	WLAN_STA_BLOCK_BA	= 1<<11,
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -551,7 +551,8 @@ static void ath_tx_complete_aggr(struct 
+ 		if (clear_filter)
+ 			tid->ac->clear_ps_filter = true;
+ 		list_splice(&bf_pending, &tid->buf_q);
+-		ath_tx_queue_tid(txq, tid);
++		if (!an->sleeping)
++			ath_tx_queue_tid(txq, tid);
+ 		spin_unlock_bh(&txq->axq_lock);
+ 	}
  
- static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah,
- 						 u8 num_chains,
- 						 struct coeff *coeff)
+@@ -643,8 +644,10 @@ static u32 ath_lookup_rate(struct ath_so
+  * meet the minimum required mpdudensity.
+  */
+ static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid,
+-				  struct ath_buf *bf, u16 frmlen)
++				  struct ath_buf *bf, u16 frmlen,
++				  bool first_subfrm)
  {
--	struct ath_common *common = ath9k_hw_common(ah);
- 	int i, im, nmeasurement;
--	int magnitude, phase;
- 	u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS];
- 
- 	memset(tx_corr_coeff, 0, sizeof(tx_corr_coeff));
-@@ -657,37 +669,28 @@ static void ar9003_hw_tx_iqcal_load_avg_
- 
- 	/* Load the average of 2 passes */
- 	for (i = 0; i < num_chains; i++) {
--		if (AR_SREV_9485(ah))
--			nmeasurement = REG_READ_FIELD(ah,
--					AR_PHY_TX_IQCAL_STATUS_B0_9485,
--					AR_PHY_CALIBRATED_GAINS_0);
--		else
--			nmeasurement = REG_READ_FIELD(ah,
--					AR_PHY_TX_IQCAL_STATUS_B0,
--					AR_PHY_CALIBRATED_GAINS_0);
-+		nmeasurement = REG_READ_FIELD(ah,
-+				AR_PHY_TX_IQCAL_STATUS_B0,
-+				AR_PHY_CALIBRATED_GAINS_0);
- 
- 		if (nmeasurement > MAX_MEASUREMENT)
- 			nmeasurement = MAX_MEASUREMENT;
- 
--		for (im = 0; im < nmeasurement; im++) {
--			/*
--			 * Determine which 2 passes are closest and compute avg
--			 * magnitude
--			 */
--			if (!ar9003_hw_compute_closest_pass_and_avg(coeff->mag_coeff[i][im],
--								    &magnitude))
--				goto disable_txiqcal;
-+		/* detect outlier only if nmeasurement > 1 */
-+		if (nmeasurement > 1) {
-+			/* Detect magnitude outlier */
-+			ar9003_hw_detect_outlier(coeff->mag_coeff[i],
-+					nmeasurement, MAX_MAG_DELTA);
-+
-+			/* Detect phase outlier */
-+			ar9003_hw_detect_outlier(coeff->phs_coeff[i],
-+					nmeasurement, MAX_PHS_DELTA);
-+		}
++#define FIRST_DESC_NDELIMS 60
+ 	struct sk_buff *skb = bf->bf_mpdu;
+ 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+ 	u32 nsymbits, nsymbols;
+@@ -667,6 +670,13 @@ static int ath_compute_num_delims(struct
+ 		ndelim += ATH_AGGR_ENCRYPTDELIM;
+ 
+ 	/*
++	 * Add delimiter when using RTS/CTS with aggregation
++	 * and non enterprise AR9003 card
++	 */
++	if (first_subfrm)
++		ndelim = max(ndelim, FIRST_DESC_NDELIMS);
++
++	/*
+ 	 * Convert desired mpdu density from microeconds to bytes based
+ 	 * on highest rate in rate series (i.e. first rate) to determine
+ 	 * required minimum length for subframe. Take into account
+@@ -755,7 +765,6 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+ 			status = ATH_AGGR_LIMITED;
+ 			break;
+ 		}
+-		nframes++;
+ 
+ 		/* add padding for previous frame to aggregation length */
+ 		al += bpad + al_delta;
+@@ -764,9 +773,11 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+ 		 * Get the delimiters needed to meet the MPDU
+ 		 * density for this node.
+ 		 */
+-		ndelim = ath_compute_num_delims(sc, tid, bf_first, fi->framelen);
++		ndelim = ath_compute_num_delims(sc, tid, bf_first, fi->framelen,
++						!nframes);
+ 		bpad = PADBYTES(al_delta) + (ndelim << 2);
+ 
++		nframes++;
+ 		bf->bf_next = NULL;
+ 		ath9k_hw_set_desc_link(sc->sc_ah, bf->bf_desc, 0);
+ 
+@@ -1413,7 +1424,8 @@ static void ath_tx_send_ampdu(struct ath
+ 		 */
+ 		TX_STAT_INC(txctl->txq->axq_qnum, a_queued_sw);
+ 		list_add_tail(&bf->list, &tid->buf_q);
+-		ath_tx_queue_tid(txctl->txq, tid);
++		if (!txctl->an || !txctl->an->sleeping)
++			ath_tx_queue_tid(txctl->txq, tid);
+ 		return;
+ 	}
  
--			/*
--			 * Determine which 2 passes are closest and compute avg
--			 * phase
--			 */
--			if (!ar9003_hw_compute_closest_pass_and_avg(coeff->phs_coeff[i][im],
--								    &phase))
--				goto disable_txiqcal;
-+		for (im = 0; im < nmeasurement; im++) {
- 
--			coeff->iqc_coeff[0] = (magnitude & 0x7f) |
--					      ((phase & 0x7f) << 7);
-+			coeff->iqc_coeff[0] = (coeff->mag_coeff[i][im] & 0x7f) |
-+				((coeff->phs_coeff[i][im] & 0x7f) << 7);
- 
- 			if ((im % 2) == 0)
- 				REG_RMW_FIELD(ah, tx_corr_coeff[im][i],
-@@ -707,141 +710,37 @@ static void ar9003_hw_tx_iqcal_load_avg_
- 
- 	return;
- 
--disable_txiqcal:
--	REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_3,
--		      AR_PHY_TX_IQCAL_CONTROL_3_IQCORR_EN, 0x0);
--	REG_RMW_FIELD(ah, AR_PHY_RX_IQCAL_CORR_B0,
--		      AR_PHY_RX_IQCAL_CORR_B0_LOOPBACK_IQCORR_EN, 0x0);
--
--	ath_dbg(common, ATH_DBG_CALIBRATE, "TX IQ Cal disabled\n");
- }
+@@ -1572,9 +1584,9 @@ u8 ath_txchainmask_reduction(struct ath_
+ {
+ 	struct ath_hw *ah = sc->sc_ah;
+ 	struct ath9k_channel *curchan = ah->curchan;
+-	if ((sc->sc_flags & SC_OP_ENABLE_APM) &&
+-			(curchan->channelFlags & CHANNEL_5GHZ) &&
+-			(chainmask == 0x7) && (rate < 0x90))
++	if ((ah->caps.hw_caps & ATH9K_HW_CAP_APM) &&
++	    (curchan->channelFlags & CHANNEL_5GHZ) &&
++	    (chainmask == 0x7) && (rate < 0x90))
+ 		return 0x3;
+ 	else
+ 		return chainmask;
+--- a/include/net/cfg80211.h
++++ b/include/net/cfg80211.h
+@@ -421,6 +421,7 @@ struct station_parameters {
+  * @STATION_INFO_RX_BITRATE: @rxrate fields are filled
+  * @STATION_INFO_BSS_PARAM: @bss_param filled
+  * @STATION_INFO_CONNECTED_TIME: @connected_time filled
++ * @STATION_INFO_ASSOC_REQ_IES: @assoc_req_ies filled
+  */
+ enum station_info_flags {
+ 	STATION_INFO_INACTIVE_TIME	= 1<<0,
+@@ -439,7 +440,8 @@ enum station_info_flags {
+ 	STATION_INFO_SIGNAL_AVG		= 1<<13,
+ 	STATION_INFO_RX_BITRATE		= 1<<14,
+ 	STATION_INFO_BSS_PARAM          = 1<<15,
+-	STATION_INFO_CONNECTED_TIME	= 1<<16
++	STATION_INFO_CONNECTED_TIME	= 1<<16,
++	STATION_INFO_ASSOC_REQ_IES	= 1<<17
+ };
  
--static void ar9003_hw_tx_iq_cal(struct ath_hw *ah)
-+static bool ar9003_hw_tx_iq_cal_run(struct ath_hw *ah)
+ /**
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -2236,7 +2236,7 @@ static int nl80211_send_station(struct s
+ 	}
+ 	nla_nest_end(msg, sinfoattr);
+ 
+-	if (sinfo->assoc_req_ies)
++	if (sinfo->filled & STATION_INFO_ASSOC_REQ_IES)
+ 		NLA_PUT(msg, NL80211_ATTR_IE, sinfo->assoc_req_ies_len,
+ 			sinfo->assoc_req_ies);
+ 
+--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+@@ -415,36 +415,12 @@ static void ar9003_hw_set11n_ratescenari
+ static void ar9003_hw_set11n_aggr_first(struct ath_hw *ah, void *ds,
+ 					u32 aggrLen)
  {
- 	struct ath_common *common = ath9k_hw_common(ah);
--	static const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
--		AR_PHY_TX_IQCAL_STATUS_B0,
--		AR_PHY_TX_IQCAL_STATUS_B1,
--		AR_PHY_TX_IQCAL_STATUS_B2,
--	};
--	static const u32 chan_info_tab[] = {
--		AR_PHY_CHAN_INFO_TAB_0,
--		AR_PHY_CHAN_INFO_TAB_1,
--		AR_PHY_CHAN_INFO_TAB_2,
--	};
--	struct coeff coeff;
--	s32 iq_res[6];
--	s32 i, j, ip, im, nmeasurement;
--	u8 nchains = get_streams(common->tx_chainmask);
+-#define FIRST_DESC_NDELIMS 60
+ 	struct ar9003_txc *ads = (struct ar9003_txc *) ds;
+ 
+ 	ads->ctl12 |= (AR_IsAggr | AR_MoreAggr);
+ 
+-	if (ah->ent_mode & AR_ENT_OTP_MPSD) {
+-		u32 ctl17, ndelim;
+-		/*
+-		 * Add delimiter when using RTS/CTS with aggregation
+-		 * and non enterprise AR9003 card
+-		 */
+-		ctl17 = ads->ctl17;
+-		ndelim = MS(ctl17, AR_PadDelim);
 -
--	for (ip = 0; ip < MPASS; ip++) {
--		REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1,
--			      AR_PHY_TX_IQCAQL_CONTROL_1_IQCORR_I_Q_COFF_DELPT,
--			      DELPT);
--		REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_START,
--			      AR_PHY_TX_IQCAL_START_DO_CAL,
--			      AR_PHY_TX_IQCAL_START_DO_CAL);
--
--		if (!ath9k_hw_wait(ah, AR_PHY_TX_IQCAL_START,
--				   AR_PHY_TX_IQCAL_START_DO_CAL,
--				   0, AH_WAIT_TIMEOUT)) {
--			ath_dbg(common, ATH_DBG_CALIBRATE,
--				"Tx IQ Cal not complete.\n");
--			goto TX_IQ_CAL_FAILED;
+-		if (ndelim < FIRST_DESC_NDELIMS) {
+-			aggrLen += (FIRST_DESC_NDELIMS - ndelim) * 4;
+-			ndelim = FIRST_DESC_NDELIMS;
 -		}
 -
--		nmeasurement = REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_STATUS_B0,
--					      AR_PHY_CALIBRATED_GAINS_0);
--			if (nmeasurement > MAX_MEASUREMENT)
--				nmeasurement = MAX_MEASUREMENT;
--
--		for (i = 0; i < nchains; i++) {
--			ath_dbg(common, ATH_DBG_CALIBRATE,
--				"Doing Tx IQ Cal for chain %d.\n", i);
--			for (im = 0; im < nmeasurement; im++) {
--				if (REG_READ(ah, txiqcal_status[i]) &
--					     AR_PHY_TX_IQCAL_STATUS_FAILED) {
--					ath_dbg(common, ATH_DBG_CALIBRATE,
--						"Tx IQ Cal failed for chain %d.\n", i);
--					goto TX_IQ_CAL_FAILED;
--				}
--
--				for (j = 0; j < 3; j++) {
--					u8 idx = 2 * j,
--					   offset = 4 * (3 * im + j);
--
--					REG_RMW_FIELD(ah, AR_PHY_CHAN_INFO_MEMORY,
--						      AR_PHY_CHAN_INFO_TAB_S2_READ,
--						      0);
--
--					/* 32 bits */
--					iq_res[idx] = REG_READ(ah,
--							chan_info_tab[i] +
--							offset);
--
--					REG_RMW_FIELD(ah, AR_PHY_CHAN_INFO_MEMORY,
--						      AR_PHY_CHAN_INFO_TAB_S2_READ,
--						      1);
--
--					/* 16 bits */
--					iq_res[idx+1] = 0xffff & REG_READ(ah,
--								chan_info_tab[i] +
--								offset);
--
--					ath_dbg(common, ATH_DBG_CALIBRATE,
--						"IQ RES[%d]=0x%x IQ_RES[%d]=0x%x\n",
--						idx, iq_res[idx], idx+1, iq_res[idx+1]);
--				}
--
--				if (!ar9003_hw_calc_iq_corr(ah, i, iq_res,
--							    coeff.iqc_coeff)) {
--					ath_dbg(common, ATH_DBG_CALIBRATE,
--						"Failed in calculation of IQ correction.\n");
--					goto TX_IQ_CAL_FAILED;
--				}
--				coeff.mag_coeff[i][im][ip] =
--						coeff.iqc_coeff[0] & 0x7f;
--				coeff.phs_coeff[i][im][ip] =
--						(coeff.iqc_coeff[0] >> 7) & 0x7f;
+-		ctl17 &= ~AR_AggrLen;
+-		ctl17 |= SM(aggrLen, AR_AggrLen);
 -
--				if (coeff.mag_coeff[i][im][ip] > 63)
--					coeff.mag_coeff[i][im][ip] -= 128;
--				if (coeff.phs_coeff[i][im][ip] > 63)
--					coeff.phs_coeff[i][im][ip] -= 128;
+-		ctl17 &= ~AR_PadDelim;
+-		ctl17 |= SM(ndelim, AR_PadDelim);
 -
--			}
--		}
+-		ads->ctl17 = ctl17;
+-	} else {
+-		ads->ctl17 &= ~AR_AggrLen;
+-		ads->ctl17 |= SM(aggrLen, AR_AggrLen);
 -	}
--
--	ar9003_hw_tx_iqcal_load_avg_2_passes(ah, nchains, &coeff);
--
--	return;
--
--TX_IQ_CAL_FAILED:
--	ath_dbg(common, ATH_DBG_CALIBRATE, "Tx IQ Cal failed\n");
--}
--
--static void ar9003_hw_tx_iq_cal_run(struct ath_hw *ah)
--{
- 	u8 tx_gain_forced;
- 
--	REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1_9485,
--		      AR_PHY_TX_IQCAQL_CONTROL_1_IQCORR_I_Q_COFF_DELPT, DELPT);
- 	tx_gain_forced = REG_READ_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
- 					AR_PHY_TXGAIN_FORCE);
- 	if (tx_gain_forced)
- 		REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
- 			      AR_PHY_TXGAIN_FORCE, 0);
- 
--	REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_START_9485,
--		      AR_PHY_TX_IQCAL_START_DO_CAL_9485, 1);
-+	REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_START,
-+		      AR_PHY_TX_IQCAL_START_DO_CAL, 1);
-+
-+	if (!ath9k_hw_wait(ah, AR_PHY_TX_IQCAL_START,
-+			AR_PHY_TX_IQCAL_START_DO_CAL, 0,
-+			AH_WAIT_TIMEOUT)) {
-+		ath_dbg(common, ATH_DBG_CALIBRATE,
-+			"Tx IQ Cal is not completed.\n");
-+		return false;
-+	}
-+	return true;
++	ads->ctl17 &= ~AR_AggrLen;
++	ads->ctl17 |= SM(aggrLen, AR_AggrLen);
  }
  
- static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah)
+ static void ar9003_hw_set11n_aggr_middle(struct ath_hw *ah, void *ds,
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -565,7 +565,6 @@ set_timer:
+ static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)
  {
- 	struct ath_common *common = ath9k_hw_common(ah);
- 	const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
--		AR_PHY_TX_IQCAL_STATUS_B0_9485,
-+		AR_PHY_TX_IQCAL_STATUS_B0,
- 		AR_PHY_TX_IQCAL_STATUS_B1,
- 		AR_PHY_TX_IQCAL_STATUS_B2,
- 	};
-@@ -853,7 +752,7 @@ static void ar9003_hw_tx_iq_cal_post_pro
- 	struct coeff coeff;
- 	s32 iq_res[6];
- 	u8 num_chains = 0;
--	int i, ip, im, j;
-+	int i, im, j;
- 	int nmeasurement;
- 
- 	for (i = 0; i < AR9300_MAX_CHAINS; i++) {
-@@ -861,71 +760,69 @@ static void ar9003_hw_tx_iq_cal_post_pro
- 			num_chains++;
+ 	struct ath_node *an;
+-	struct ath_hw *ah = sc->sc_ah;
+ 	an = (struct ath_node *)sta->drv_priv;
+ 
+ #ifdef CONFIG_ATH9K_DEBUGFS
+@@ -574,9 +573,6 @@ static void ath_node_attach(struct ath_s
+ 	spin_unlock(&sc->nodes_lock);
+ 	an->sta = sta;
+ #endif
+-	if ((ah->caps.hw_caps) & ATH9K_HW_CAP_APM)
+-		sc->sc_flags |= SC_OP_ENABLE_APM;
+-
+ 	if (sc->sc_flags & SC_OP_TXAGGR) {
+ 		ath_tx_node_init(sc, an);
+ 		an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +
+@@ -826,11 +822,9 @@ irqreturn_t ath_isr(int irq, void *dev)
+ 	if (status & ATH9K_INT_TXURN)
+ 		ath9k_hw_updatetxtriglevel(ah, true);
+ 
+-	if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
+-		if (status & ATH9K_INT_RXEOL) {
+-			ah->imask &= ~(ATH9K_INT_RXEOL | ATH9K_INT_RXORN);
+-			ath9k_hw_set_interrupts(ah, ah->imask);
+-		}
++	if (status & ATH9K_INT_RXEOL) {
++		ah->imask &= ~(ATH9K_INT_RXEOL | ATH9K_INT_RXORN);
++		ath9k_hw_set_interrupts(ah, ah->imask);
  	}
  
--	for (ip = 0; ip < MPASS; ip++) {
--		for (i = 0; i < num_chains; i++) {
--			nmeasurement = REG_READ_FIELD(ah,
--					AR_PHY_TX_IQCAL_STATUS_B0_9485,
--					AR_PHY_CALIBRATED_GAINS_0);
--			if (nmeasurement > MAX_MEASUREMENT)
--				nmeasurement = MAX_MEASUREMENT;
-+	for (i = 0; i < num_chains; i++) {
-+		nmeasurement = REG_READ_FIELD(ah,
-+				AR_PHY_TX_IQCAL_STATUS_B0,
-+				AR_PHY_CALIBRATED_GAINS_0);
-+		if (nmeasurement > MAX_MEASUREMENT)
-+			nmeasurement = MAX_MEASUREMENT;
-+
-+		for (im = 0; im < nmeasurement; im++) {
-+			ath_dbg(common, ATH_DBG_CALIBRATE,
-+				"Doing Tx IQ Cal for chain %d.\n", i);
- 
--			for (im = 0; im < nmeasurement; im++) {
-+			if (REG_READ(ah, txiqcal_status[i]) &
-+					AR_PHY_TX_IQCAL_STATUS_FAILED) {
- 				ath_dbg(common, ATH_DBG_CALIBRATE,
--					"Doing Tx IQ Cal for chain %d.\n", i);
+ 	if (status & ATH9K_INT_MIB) {
+@@ -1680,6 +1674,7 @@ static int ath9k_config(struct ieee80211
+ 
+ 	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+ 		struct ieee80211_channel *curchan = hw->conf.channel;
++		struct ath9k_channel old_chan;
+ 		int pos = curchan->hw_value;
+ 		int old_pos = -1;
+ 		unsigned long flags;
+@@ -1696,15 +1691,25 @@ static int ath9k_config(struct ieee80211
+ 			"Set channel: %d MHz type: %d\n",
+ 			curchan->center_freq, conf->channel_type);
+ 
+-		ath9k_cmn_update_ichannel(&sc->sc_ah->channels[pos],
+-					  curchan, conf->channel_type);
 -
--				if (REG_READ(ah, txiqcal_status[i]) &
--				    AR_PHY_TX_IQCAL_STATUS_FAILED) {
--					ath_dbg(common, ATH_DBG_CALIBRATE,
- 					"Tx IQ Cal failed for chain %d.\n", i);
--					goto tx_iqcal_fail;
--				}
-+				goto tx_iqcal_fail;
-+			}
- 
--				for (j = 0; j < 3; j++) {
--					u32 idx = 2 * j, offset = 4 * (3 * im + j);
-+			for (j = 0; j < 3; j++) {
-+				u32 idx = 2 * j, offset = 4 * (3 * im + j);
- 
--					REG_RMW_FIELD(ah,
-+				REG_RMW_FIELD(ah,
- 						AR_PHY_CHAN_INFO_MEMORY,
- 						AR_PHY_CHAN_INFO_TAB_S2_READ,
- 						0);
- 
--					/* 32 bits */
--					iq_res[idx] = REG_READ(ah,
--							chan_info_tab[i] +
--							offset);
-+				/* 32 bits */
-+				iq_res[idx] = REG_READ(ah,
-+						chan_info_tab[i] +
-+						offset);
- 
--					REG_RMW_FIELD(ah,
-+				REG_RMW_FIELD(ah,
- 						AR_PHY_CHAN_INFO_MEMORY,
- 						AR_PHY_CHAN_INFO_TAB_S2_READ,
- 						1);
- 
--					/* 16 bits */
--					iq_res[idx + 1] = 0xffff & REG_READ(ah,
--							  chan_info_tab[i] + offset);
--
--					ath_dbg(common, ATH_DBG_CALIBRATE,
--						"IQ RES[%d]=0x%x"
--						"IQ_RES[%d]=0x%x\n",
--						idx, iq_res[idx], idx + 1,
--						iq_res[idx + 1]);
--				}
-+				/* 16 bits */
-+				iq_res[idx + 1] = 0xffff & REG_READ(ah,
-+						chan_info_tab[i] + offset);
- 
--				if (!ar9003_hw_calc_iq_corr(ah, i, iq_res,
--							    coeff.iqc_coeff)) {
--					ath_dbg(common, ATH_DBG_CALIBRATE,
--					 "Failed in calculation of IQ correction.\n");
--					goto tx_iqcal_fail;
--				}
-+				ath_dbg(common, ATH_DBG_CALIBRATE,
-+					"IQ RES[%d]=0x%x"
-+					"IQ_RES[%d]=0x%x\n",
-+					idx, iq_res[idx], idx + 1,
-+					iq_res[idx + 1]);
-+			}
- 
--				coeff.mag_coeff[i][im][ip] =
--						coeff.iqc_coeff[0] & 0x7f;
--				coeff.phs_coeff[i][im][ip] =
--						(coeff.iqc_coeff[0] >> 7) & 0x7f;
--
--				if (coeff.mag_coeff[i][im][ip] > 63)
--					coeff.mag_coeff[i][im][ip] -= 128;
--				if (coeff.phs_coeff[i][im][ip] > 63)
--					coeff.phs_coeff[i][im][ip] -= 128;
-+			if (!ar9003_hw_calc_iq_corr(ah, i, iq_res,
-+						coeff.iqc_coeff)) {
-+				ath_dbg(common, ATH_DBG_CALIBRATE,
-+					"Failed in calculation of \
-+					IQ correction.\n");
-+				goto tx_iqcal_fail;
- 			}
-+
-+			coeff.mag_coeff[i][im] = coeff.iqc_coeff[0] & 0x7f;
-+			coeff.phs_coeff[i][im] =
-+				(coeff.iqc_coeff[0] >> 7) & 0x7f;
-+
-+			if (coeff.mag_coeff[i][im] > 63)
-+				coeff.mag_coeff[i][im] -= 128;
-+			if (coeff.phs_coeff[i][im] > 63)
-+				coeff.phs_coeff[i][im] -= 128;
- 		}
+ 		/* update survey stats for the old channel before switching */
+ 		spin_lock_irqsave(&common->cc_lock, flags);
+ 		ath_update_survey_stats(sc);
+ 		spin_unlock_irqrestore(&common->cc_lock, flags);
+ 
+ 		/*
++		 * Preserve the current channel values, before updating
++		 * the same channel
++		 */
++		if (old_pos == pos) {
++			memcpy(&old_chan, &sc->sc_ah->channels[pos],
++				sizeof(struct ath9k_channel));
++			ah->curchan = &old_chan;
++		}
++
++		ath9k_cmn_update_ichannel(&sc->sc_ah->channels[pos],
++					  curchan, conf->channel_type);
++
++		/*
+ 		 * If the operating channel changes, change the survey in-use flags
+ 		 * along with it.
+ 		 * Reset the survey data for the new channel, unless we're switching
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -761,7 +761,7 @@ static struct ath_buf *ath_get_next_rx_b
+ 	 * on.  All this is necessary because of our use of
+ 	 * a self-linked list to avoid rx overruns.
+ 	 */
+-	ret = ath9k_hw_rxprocdesc(ah, ds, rs, 0);
++	ret = ath9k_hw_rxprocdesc(ah, ds, rs);
+ 	if (ret == -EINPROGRESS) {
+ 		struct ath_rx_status trs;
+ 		struct ath_buf *tbf;
+@@ -787,7 +787,7 @@ static struct ath_buf *ath_get_next_rx_b
+ 		 */
+ 
+ 		tds = tbf->bf_desc;
+-		ret = ath9k_hw_rxprocdesc(ah, tds, &trs, 0);
++		ret = ath9k_hw_rxprocdesc(ah, tds, &trs);
+ 		if (ret == -EINPROGRESS)
+ 			return NULL;
  	}
- 	ar9003_hw_tx_iqcal_load_avg_2_passes(ah, num_chains, &coeff);
-@@ -941,6 +838,7 @@ static bool ar9003_hw_init_cal(struct at
- {
- 	struct ath_common *common = ath9k_hw_common(ah);
- 	int val;
-+	bool txiqcal_done = false;
+@@ -1978,5 +1978,10 @@ requeue:
  
- 	val = REG_READ(ah, AR_ENT_OTP);
- 	ath_dbg(common, ATH_DBG_CALIBRATE, "ath9k: AR_ENT_OTP 0x%x\n", val);
-@@ -957,14 +855,22 @@ static bool ar9003_hw_init_cal(struct at
- 		ar9003_hw_set_chain_masks(ah, 0x7, 0x7);
+ 	spin_unlock_bh(&sc->rx.rxbuflock);
  
- 	/* Do Tx IQ Calibration */
--	if (AR_SREV_9485(ah))
--		ar9003_hw_tx_iq_cal_run(ah);
--	else
--		ar9003_hw_tx_iq_cal(ah);
-+	REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1,
-+		      AR_PHY_TX_IQCAL_CONTROL_1_IQCORR_I_Q_COFF_DELPT,
-+		      DELPT);
- 
--	REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
--	udelay(5);
--	REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
-+	/*
-+	 * For AR9485 or later chips, TxIQ cal runs as part of
-+	 * AGC calibration
-+	 */
-+	if (AR_SREV_9485_OR_LATER(ah))
-+		txiqcal_done = true;
-+	else {
-+		txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);
-+		REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
-+		udelay(5);
-+		REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
++	if (!(ah->imask & ATH9K_INT_RXEOL)) {
++		ah->imask |= (ATH9K_INT_RXEOL | ATH9K_INT_RXORN);
++		ath9k_hw_set_interrupts(ah, ah->imask);
 +	}
- 
- 	/* Calibrate the AGC */
- 	REG_WRITE(ah, AR_PHY_AGC_CONTROL,
-@@ -979,7 +885,7 @@ static bool ar9003_hw_init_cal(struct at
- 		return false;
++
+ 	return 0;
+ }
+--- a/drivers/net/wireless/ath/ath9k/mac.c
++++ b/drivers/net/wireless/ath/ath9k/mac.c
+@@ -345,21 +345,8 @@ int ath9k_hw_setuptxqueue(struct ath_hw 
  	}
+ 	memset(qi, 0, sizeof(struct ath9k_tx_queue_info));
+ 	qi->tqi_type = type;
+-	if (qinfo == NULL) {
+-		qi->tqi_qflags =
+-			TXQ_FLAG_TXOKINT_ENABLE
+-			| TXQ_FLAG_TXERRINT_ENABLE
+-			| TXQ_FLAG_TXDESCINT_ENABLE | TXQ_FLAG_TXURNINT_ENABLE;
+-		qi->tqi_aifs = INIT_AIFS;
+-		qi->tqi_cwmin = ATH9K_TXQ_USEDEFAULT;
+-		qi->tqi_cwmax = INIT_CWMAX;
+-		qi->tqi_shretry = INIT_SH_RETRY;
+-		qi->tqi_lgretry = INIT_LG_RETRY;
+-		qi->tqi_physCompBuf = 0;
+-	} else {
+-		qi->tqi_physCompBuf = qinfo->tqi_physCompBuf;
+-		(void) ath9k_hw_set_txq_props(ah, q, qinfo);
+-	}
++	qi->tqi_physCompBuf = qinfo->tqi_physCompBuf;
++	(void) ath9k_hw_set_txq_props(ah, q, qinfo);
+ 
+ 	return q;
+ }
+@@ -564,7 +551,7 @@ bool ath9k_hw_resettxqueue(struct ath_hw
+ EXPORT_SYMBOL(ath9k_hw_resettxqueue);
+ 
+ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds,
+-			struct ath_rx_status *rs, u64 tsf)
++			struct ath_rx_status *rs)
+ {
+ 	struct ar5416_desc ads;
+ 	struct ar5416_desc *adsp = AR5416DESC(ds);
+--- a/drivers/net/wireless/ath/ath9k/mac.h
++++ b/drivers/net/wireless/ath/ath9k/mac.h
+@@ -687,7 +687,7 @@ int ath9k_hw_setuptxqueue(struct ath_hw 
+ bool ath9k_hw_releasetxqueue(struct ath_hw *ah, u32 q);
+ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q);
+ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds,
+-			struct ath_rx_status *rs, u64 tsf);
++			struct ath_rx_status *rs);
+ void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds,
+ 			  u32 size, u32 flags);
+ bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set);
+--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+@@ -839,20 +839,8 @@ static bool ar9003_hw_init_cal(struct at
+ 			       struct ath9k_channel *chan)
+ {
+ 	struct ath_common *common = ath9k_hw_common(ah);
+-	struct ath9k_hw_capabilities *pCap = &ah->caps;
+-	int val;
+ 	bool txiqcal_done = false;
  
--	if (AR_SREV_9485(ah))
-+	if (txiqcal_done)
+-	val = REG_READ(ah, AR_ENT_OTP);
+-	ath_dbg(common, ATH_DBG_CALIBRATE, "ath9k: AR_ENT_OTP 0x%x\n", val);
+-
+-	/* Configure rx/tx chains before running AGC/TxiQ cals */
+-	if (val & AR_ENT_OTP_CHAIN2_DISABLE)
+-		ar9003_hw_set_chain_masks(ah, 0x3, 0x3);
+-	else
+-		ar9003_hw_set_chain_masks(ah, pCap->rx_chainmask,
+-					  pCap->tx_chainmask);
+-
+ 	/* Do Tx IQ Calibration */
+ 	REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1,
+ 		      AR_PHY_TX_IQCAL_CONTROL_1_IQCORR_I_Q_COFF_DELPT,
+@@ -887,9 +875,6 @@ static bool ar9003_hw_init_cal(struct at
+ 	if (txiqcal_done)
  		ar9003_hw_tx_iq_cal_post_proc(ah);
  
- 	/* Revert chainmasks to their original values before NF cal */
+-	/* Revert chainmasks to their original values before NF cal */
+-	ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
+-
+ 	ath9k_hw_start_nfcal(ah, true);
+ 
+ 	/* Initialize list pointers */
+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+@@ -540,7 +540,7 @@ static void ar9003_hw_init_bb(struct ath
+ 	udelay(synthDelay + BASE_ACTIVATE_DELAY);
+ }
+ 
+-void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
++static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
+ {
+ 	switch (rx) {
+ 	case 0x5:
 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -548,15 +548,12 @@
- 
- #define AR_PHY_TXGAIN_TABLE      (AR_SM_BASE + 0x300)
+@@ -1124,6 +1124,4 @@
+ #define AR_PHY_CL_TAB_CL_GAIN_MOD		0x1f
+ #define AR_PHY_CL_TAB_CL_GAIN_MOD_S		0
  
--#define AR_PHY_TX_IQCAL_START_9485		(AR_SM_BASE + 0x3c4)
--#define AR_PHY_TX_IQCAL_START_DO_CAL_9485	0x80000000
--#define AR_PHY_TX_IQCAL_START_DO_CAL_9485_S	31
--#define AR_PHY_TX_IQCAL_CONTROL_1_9485		(AR_SM_BASE + 0x3c8)
--#define AR_PHY_TX_IQCAL_STATUS_B0_9485		(AR_SM_BASE + 0x3f0)
+-void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
 -
--#define AR_PHY_TX_IQCAL_CONTROL_1   (AR_SM_BASE + 0x448)
--#define AR_PHY_TX_IQCAL_START       (AR_SM_BASE + 0x440)
--#define AR_PHY_TX_IQCAL_STATUS_B0   (AR_SM_BASE + 0x48c)
-+#define AR_PHY_TX_IQCAL_CONTROL_1   (AR_SM_BASE + AR_SREV_9485(ah) ? \
-+						 0x3c8 : 0x448)
-+#define AR_PHY_TX_IQCAL_START       (AR_SM_BASE + AR_SREV_9485(ah) ? \
-+						 0x3c4 : 0x440)
-+#define AR_PHY_TX_IQCAL_STATUS_B0   (AR_SM_BASE + AR_SREV_9485(ah) ? \
-+						 0x3f0 : 0x48c)
- #define AR_PHY_TX_IQCAL_CORR_COEFF_B0(_i)    (AR_SM_BASE + \
- 					     (AR_SREV_9485(ah) ? \
- 					      0x3d0 : 0x450) + ((_i) << 2))
-@@ -758,10 +755,10 @@
- #define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT   0x01000000
- #define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_S 24
- #define AR_PHY_CHANNEL_STATUS_RX_CLEAR      0x00000004
--#define AR_PHY_TX_IQCAQL_CONTROL_1_IQCORR_I_Q_COFF_DELPT             0x01fc0000
--#define AR_PHY_TX_IQCAQL_CONTROL_1_IQCORR_I_Q_COFF_DELPT_S                   18
--#define AR_PHY_TX_IQCAL_START_DO_CAL        0x00000001
--#define AR_PHY_TX_IQCAL_START_DO_CAL_S      0
-+#define AR_PHY_TX_IQCAL_CONTROL_1_IQCORR_I_Q_COFF_DELPT             0x01fc0000
-+#define AR_PHY_TX_IQCAL_CONTROL_1_IQCORR_I_Q_COFF_DELPT_S                   18
-+#define AR_PHY_TX_IQCAL_START_DO_CAL	    0x00000001
-+#define AR_PHY_TX_IQCAL_START_DO_CAL_S	    0
- 
- #define AR_PHY_TX_IQCAL_STATUS_FAILED    0x00000001
- #define AR_PHY_CALIBRATED_GAINS_0	 0x3e
+ #endif  /* AR9003_PHY_H */
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -453,6 +453,7 @@ void ath9k_btcoex_timer_pause(struct ath
- 
- #define ATH_LED_PIN_DEF 		1
- #define ATH_LED_PIN_9287		8
-+#define ATH_LED_PIN_9300		10
- #define ATH_LED_PIN_9485		6
- 
- #ifdef CONFIG_MAC80211_LEDS
---- a/drivers/net/wireless/ath/ath9k/gpio.c
-+++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -46,6 +46,8 @@ void ath_init_leds(struct ath_softc *sc)
- 			sc->sc_ah->led_pin = ATH_LED_PIN_9287;
- 		else if (AR_SREV_9485(sc->sc_ah))
- 			sc->sc_ah->led_pin = ATH_LED_PIN_9485;
-+		else if (AR_SREV_9300(sc->sc_ah))
-+			sc->sc_ah->led_pin = ATH_LED_PIN_9300;
- 		else
- 			sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
- 	}
---- a/drivers/net/wireless/ath/ath9k/reg.h
-+++ b/drivers/net/wireless/ath/ath9k/reg.h
-@@ -868,6 +868,8 @@
- #define AR_SREV_9485_11(_ah) \
- 	(AR_SREV_9485(_ah) && \
- 	 ((_ah)->hw_version.macRev == AR_SREV_REVISION_9485_11))
-+#define AR_SREV_9485_OR_LATER(_ah) \
-+	(((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9485))
- 
- #define AR_SREV_9285E_20(_ah) \
-     (AR_SREV_9285_12_OR_LATER(_ah) && \
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -652,7 +652,7 @@ static void ieee80211_sta_reorder_releas
-  set_release_timer:
- 
- 		mod_timer(&tid_agg_rx->reorder_timer,
--			  tid_agg_rx->reorder_time[j] +
-+			  tid_agg_rx->reorder_time[j] + 1 +
- 			  HT_RX_REORDER_BUF_TIMEOUT);
- 	} else {
- 		del_timer(&tid_agg_rx->reorder_timer);
+@@ -558,8 +558,7 @@ struct ath_ant_comb {
+ #define SC_OP_BT_PRIORITY_DETECTED   BIT(12)
+ #define SC_OP_BT_SCAN		     BIT(13)
+ #define SC_OP_ANI_RUN		     BIT(14)
+-#define SC_OP_ENABLE_APM	     BIT(15)
+-#define SC_OP_PRIM_STA_VIF	     BIT(16)
++#define SC_OP_PRIM_STA_VIF	     BIT(15)
+ 
+ /* Powersave flags */
+ #define PS_WAIT_FOR_BEACON        BIT(0)
+@@ -664,7 +663,6 @@ extern int led_blink;
+ extern bool is_ath9k_unloaded;
+ 
+ irqreturn_t ath_isr(int irq, void *dev);
+-void ath9k_init_crypto(struct ath_softc *sc);
+ int ath9k_init_device(u16 devid, struct ath_softc *sc,
+ 		    const struct ath_bus_ops *bus_ops);
+ void ath9k_deinit_device(struct ath_softc *sc);
+--- a/drivers/net/wireless/ath/ath9k/common.c
++++ b/drivers/net/wireless/ath/ath9k/common.c
+@@ -169,6 +169,32 @@ void ath9k_cmn_update_txpow(struct ath_h
+ }
+ EXPORT_SYMBOL(ath9k_cmn_update_txpow);
+ 
++void ath9k_cmn_init_crypto(struct ath_hw *ah)
++{
++	struct ath_common *common = ath9k_hw_common(ah);
++	int i = 0;
++
++	/* Get the hardware key cache size. */
++	common->keymax = AR_KEYTABLE_SIZE;
++
++	/*
++	 * 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 (ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA)
++		common->crypt_caps |= ATH_CRYPT_CAP_MIC_COMBINED;
++
++	/*
++	 * Reset the key cache since some parts do not
++	 * reset the contents on initial power up.
++	 */
++	for (i = 0; i < common->keymax; i++)
++		ath_hw_keyreset(common, (u16) i);
++}
++EXPORT_SYMBOL(ath9k_cmn_init_crypto);
++
+ static int __init ath9k_cmn_init(void)
+ {
+ 	return 0;
+--- a/drivers/net/wireless/ath/ath9k/common.h
++++ b/drivers/net/wireless/ath/ath9k/common.h
+@@ -62,3 +62,4 @@ void ath9k_cmn_btcoex_bt_stomp(struct at
+ 				  enum ath_stomp_type stomp_type);
+ void ath9k_cmn_update_txpow(struct ath_hw *ah, u16 cur_txpow,
+ 			    u16 new_txpow, u16 *txpower);
++void ath9k_cmn_init_crypto(struct ath_hw *ah);
+--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
++++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+@@ -572,25 +572,6 @@ err:
+ 	return -EINVAL;
+ }
+ 
+-static void ath9k_init_crypto(struct ath9k_htc_priv *priv)
+-{
+-	struct ath_common *common = ath9k_hw_common(priv->ah);
+-	int i = 0;
+-
+-	/* Get the hardware key cache size. */
+-	common->keymax = AR_KEYTABLE_SIZE;
+-
+-	if (priv->ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA)
+-		common->crypt_caps |= ATH_CRYPT_CAP_MIC_COMBINED;
+-
+-	/*
+-	 * Reset the key cache since some parts do not
+-	 * reset the contents on initial power up.
+-	 */
+-	for (i = 0; i < common->keymax; i++)
+-		ath_hw_keyreset(common, (u16) i);
+-}
+-
+ static void ath9k_init_channels_rates(struct ath9k_htc_priv *priv)
+ {
+ 	if (priv->ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ) {
+@@ -720,7 +701,7 @@ static int ath9k_init_priv(struct ath9k_
+ 	for (i = 0; i < ATH9K_HTC_MAX_BCN_VIF; i++)
+ 		priv->cur_beacon_conf.bslot[i] = NULL;
+ 
+-	ath9k_init_crypto(priv);
++	ath9k_cmn_init_crypto(ah);
+ 	ath9k_init_channels_rates(priv);
+ 	ath9k_init_misc(priv);
+ 
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -404,31 +404,6 @@ fail:
+ 	return error;
+ }
+ 
+-void ath9k_init_crypto(struct ath_softc *sc)
+-{
+-	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+-	int i = 0;
+-
+-	/* Get the hardware key cache size. */
+-	common->keymax = AR_KEYTABLE_SIZE;
+-
+-	/*
+-	 * Reset the key cache since some parts do not
+-	 * reset the contents on initial power up.
+-	 */
+-	for (i = 0; i < common->keymax; i++)
+-		ath_hw_keyreset(common, (u16) i);
+-
+-	/*
+-	 * 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 (sc->sc_ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA)
+-		common->crypt_caps |= ATH_CRYPT_CAP_MIC_COMBINED;
+-}
+-
+ static int ath9k_init_btcoex(struct ath_softc *sc)
+ {
+ 	struct ath_txq *txq;
+@@ -630,7 +605,7 @@ static int ath9k_init_softc(u16 devid, s
+ 	if (ret)
+ 		goto err_btcoex;
+ 
+-	ath9k_init_crypto(sc);
++	ath9k_cmn_init_crypto(sc->sc_ah);
+ 	ath9k_init_misc(sc);
+ 
+ 	return 0;
+--- a/drivers/net/wireless/ath/ath9k/pci.c
++++ b/drivers/net/wireless/ath/ath9k/pci.c
+@@ -129,7 +129,7 @@ static void ath_pci_aspm_init(struct ath
+ 		return;
+ 
+ 	parent = pdev->bus->self;
+-	if (WARN_ON(!parent))
++	if (!parent)
+ 		return;
+ 
+ 	pos = pci_pcie_cap(parent);
+@@ -338,7 +338,7 @@ static int ath_pci_resume(struct device 
+ 	   * semi-random values after suspend/resume.
+ 	   */
+ 	ath9k_ps_wakeup(sc);
+-	ath9k_init_crypto(sc);
++	ath9k_cmn_init_crypto(sc->sc_ah);
+ 	ath9k_ps_restore(sc);
+ 
+ 	sc->ps_idle = true;
 --- a/drivers/net/wireless/ath/ath9k/calib.c
 +++ b/drivers/net/wireless/ath/ath9k/calib.c
-@@ -69,15 +69,21 @@ static void ath9k_hw_update_nfcal_hist_b
+@@ -82,7 +82,6 @@ static void ath9k_hw_update_nfcal_hist_b
  					      int16_t *nfarray)
  {
  	struct ath_common *common = ath9k_hw_common(ah);
-+	struct ieee80211_conf *conf = &common->hw->conf;
+-	struct ieee80211_conf *conf = &common->hw->conf;
  	struct ath_nf_limits *limit;
  	struct ath9k_nfcal_hist *h;
  	bool high_nf_mid = false;
-+	u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
- 	int i;
- 
- 	h = cal->nfCalHist;
- 	limit = ath9k_hw_get_nf_limits(ah, ah->curchan);
+@@ -94,7 +93,7 @@ static void ath9k_hw_update_nfcal_hist_b
  
  	for (i = 0; i < NUM_NF_READINGS; i++) {
+ 		if (!(chainmask & (1 << i)) ||
+-		    ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf)))
++		    ((i >= AR5416_MAX_CHAINS) && !IS_CHAN_HT40(ah->curchan)))
+ 			continue;
+ 
+ 		h[i].nfCalBuffer[h[i].currIndex] = nfarray[i];
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -1163,6 +1163,59 @@ static const struct file_operations fops
+ 	.llseek = default_llseek,/* read accesses f_pos */
+ };
+ 
++static ssize_t read_file_dump_nfcal(struct file *file, char __user *user_buf,
++				    size_t count, loff_t *ppos)
++{
++	struct ath_softc *sc = file->private_data;
++	struct ath_hw *ah = sc->sc_ah;
++	struct ath9k_nfcal_hist *h = sc->caldata.nfCalHist;
++	struct ath_common *common = ath9k_hw_common(ah);
++	struct ieee80211_conf *conf = &common->hw->conf;
++	u32 len = 0, size = 1500;
++	u32 i, j;
++	ssize_t retval = 0;
++	char *buf;
++	u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
++	u8 nread;
++
++	buf = kzalloc(size, GFP_KERNEL);
++	if (!buf)
++		return -ENOMEM;
++
++	len += snprintf(buf + len, size - len,
++			"Channel Noise Floor : %d\n", ah->noise);
++	len += snprintf(buf + len, size - len,
++			"Chain | privNF | # Readings | NF Readings\n");
++	for (i = 0; i < NUM_NF_READINGS; i++) {
 +		if (!(chainmask & (1 << i)) ||
 +		    ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf)))
 +			continue;
 +
- 		h[i].nfCalBuffer[h[i].currIndex] = nfarray[i];
- 
- 		if (++h[i].currIndex >= ATH9K_NF_CAL_HIST_MAX)
-@@ -225,6 +231,7 @@ void ath9k_hw_loadnf(struct ath_hw *ah, 
- 	int32_t val;
- 	u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
- 	struct ath_common *common = ath9k_hw_common(ah);
-+	struct ieee80211_conf *conf = &common->hw->conf;
- 	s16 default_nf = ath9k_hw_get_default_nf(ah, chan);
- 
- 	if (ah->caldata)
-@@ -234,6 +241,9 @@ void ath9k_hw_loadnf(struct ath_hw *ah, 
- 		if (chainmask & (1 << i)) {
- 			s16 nfval;
- 
-+			if ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf))
-+				continue;
++		nread = AR_PHY_CCA_FILTERWINDOW_LENGTH - h[i].invalidNFcount;
++		len += snprintf(buf + len, size - len, " %d\t %d\t %d\t\t",
++				i, h[i].privNF, nread);
++		for (j = 0; j < nread; j++)
++			len += snprintf(buf + len, size - len,
++					" %d", h[i].nfCalBuffer[j]);
++		len += snprintf(buf + len, size - len, "\n");
++	}
 +
- 			if (h)
- 				nfval = h[i].privNF;
- 			else
-@@ -293,6 +303,9 @@ void ath9k_hw_loadnf(struct ath_hw *ah, 
- 	ENABLE_REGWRITE_BUFFER(ah);
- 	for (i = 0; i < NUM_NF_READINGS; i++) {
- 		if (chainmask & (1 << i)) {
-+			if ((i >= AR5416_MAX_CHAINS) && !conf_is_ht40(conf))
-+				continue;
++	if (len > size)
++		len = size;
++
++	retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
++	kfree(buf);
 +
- 			val = REG_READ(ah, ah->nf_regs[i]);
- 			val &= 0xFFFFFE00;
- 			val |= (((u32) (-50) << 1) & 0x1ff);
++	return retval;
++}
++
++static const struct file_operations fops_dump_nfcal = {
++	.read = read_file_dump_nfcal,
++	.open = ath9k_debugfs_open,
++	.owner = THIS_MODULE,
++	.llseek = default_llseek,
++};
++
+ static ssize_t read_file_base_eeprom(struct file *file, char __user *user_buf,
+ 				     size_t count, loff_t *ppos)
+ {
+@@ -1262,6 +1315,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+ 			    &ah->config.cwm_ignore_extcca);
+ 	debugfs_create_file("regdump", S_IRUSR, sc->debug.debugfs_phy, sc,
+ 			    &fops_regdump);
++	debugfs_create_file("dump_nfcal", S_IRUSR, sc->debug.debugfs_phy, sc,
++			    &fops_dump_nfcal);
+ 	debugfs_create_file("base_eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
+ 			    &fops_base_eeprom);
+ 	debugfs_create_file("modal_eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
+--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+@@ -69,7 +69,7 @@ static int ar9003_hw_power_interpolate(i
+ static const struct ar9300_eeprom ar9300_default = {
+ 	.eepromVersion = 2,
+ 	.templateVersion = 2,
+-	.macAddr = {1, 2, 3, 4, 5, 6},
++	.macAddr = {0, 2, 3, 4, 5, 6},
+ 	.custData = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 		     0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+ 	.baseEepHeader = {
+--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
++++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
+@@ -349,10 +349,7 @@ static u32 ath9k_hw_4k_get_eeprom(struct
+ 	case EEP_ANT_DIV_CTL1:
+ 		return pModal->antdiv_ctl1;
+ 	case EEP_TXGAIN_TYPE:
+-		if (ver_minor >= AR5416_EEP_MINOR_VER_19)
+-			return pBase->txGainType;
+-		else
+-			return AR5416_EEP_TXGAIN_ORIGINAL;
++		return pBase->txGainType;
+ 	default:
+ 		return 0;
+ 	}