1 --- a/drivers/net/wireless/ath/ath5k/base.c
2 +++ b/drivers/net/wireless/ath/ath5k/base.c
3 @@ -325,6 +325,8 @@ ath5k_setup_channels(struct ath5k_hw *ah
4 if (!ath5k_is_standard_channel(ch, band))
7 + channels[count].max_power = AR5K_TUNE_MAX_TXPOWER/2;
12 @@ -850,7 +852,7 @@ ath5k_txbuf_free_skb(struct ath5k_hw *ah
14 dma_unmap_single(ah->dev, bf->skbaddr, bf->skb->len,
16 - dev_kfree_skb_any(bf->skb);
17 + ieee80211_free_txskb(ah->hw, bf->skb);
20 bf->desc->ds_data = 0;
21 @@ -1577,7 +1579,7 @@ ath5k_tx_queue(struct ieee80211_hw *hw,
25 - dev_kfree_skb_any(skb);
26 + ieee80211_free_txskb(hw, skb);
30 --- a/net/mac80211/agg-rx.c
31 +++ b/net/mac80211/agg-rx.c
32 @@ -203,6 +203,8 @@ static void ieee80211_send_addba_resp(st
33 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
34 else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
35 memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
36 + else if (sdata->vif.type == NL80211_IFTYPE_WDS)
37 + memcpy(mgmt->bssid, da, ETH_ALEN);
39 mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
40 IEEE80211_STYPE_ACTION);
41 --- a/net/mac80211/agg-tx.c
42 +++ b/net/mac80211/agg-tx.c
43 @@ -81,7 +81,8 @@ static void ieee80211_send_addba_request
44 memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
45 if (sdata->vif.type == NL80211_IFTYPE_AP ||
46 sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
47 - sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
48 + sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
49 + sdata->vif.type == NL80211_IFTYPE_WDS)
50 memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
51 else if (sdata->vif.type == NL80211_IFTYPE_STATION)
52 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
53 @@ -460,6 +461,7 @@ int ieee80211_start_tx_ba_session(struct
54 sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
55 sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
56 sdata->vif.type != NL80211_IFTYPE_AP &&
57 + sdata->vif.type != NL80211_IFTYPE_WDS &&
58 sdata->vif.type != NL80211_IFTYPE_ADHOC)
61 @@ -869,7 +871,7 @@ void ieee80211_process_addba_resp(struct
64 ___ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_INITIATOR,
70 --- a/net/mac80211/debugfs_sta.c
71 +++ b/net/mac80211/debugfs_sta.c
72 @@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
73 test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
75 int res = scnprintf(buf, sizeof(buf),
76 - "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
77 + "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
78 TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
79 TEST(PS_DRIVER), TEST(AUTHORIZED),
81 - TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
82 + TEST(WME), TEST(CLEAR_PS_FILT),
83 TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
84 TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
85 TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
86 --- a/net/mac80211/iface.c
87 +++ b/net/mac80211/iface.c
88 @@ -420,7 +420,6 @@ int ieee80211_do_open(struct wireless_de
89 struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
90 struct net_device *dev = wdev->netdev;
91 struct ieee80211_local *local = sdata->local;
92 - struct sta_info *sta;
95 u32 hw_reconf_flags = 0;
96 @@ -575,30 +574,8 @@ int ieee80211_do_open(struct wireless_de
98 set_bit(SDATA_STATE_RUNNING, &sdata->state);
100 - if (sdata->vif.type == NL80211_IFTYPE_WDS) {
101 - /* Create STA entry for the WDS peer */
102 - sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
106 - goto err_del_interface;
109 - sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
110 - sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
111 - sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
113 - res = sta_info_insert(sta);
115 - /* STA has been freed */
116 - goto err_del_interface;
119 - rate_control_rate_init(sta);
120 - netif_carrier_on(dev);
121 - } else if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE) {
122 + if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE)
123 rcu_assign_pointer(local->p2p_sdata, sdata);
127 * set_multicast_list will be invoked by the networking core
128 @@ -849,7 +826,7 @@ static void ieee80211_do_stop(struct iee
129 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
130 if (info->control.vif == &sdata->vif) {
131 __skb_unlink(skb, &local->pending[i]);
132 - dev_kfree_skb_irq(skb);
133 + ieee80211_free_txskb(&local->hw, skb);
137 @@ -997,6 +974,72 @@ static void ieee80211_if_setup(struct ne
138 dev->destructor = free_netdev;
141 +static void ieee80211_wds_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
142 + struct sk_buff *skb)
144 + struct ieee80211_local *local = sdata->local;
145 + struct ieee80211_rx_status *rx_status;
146 + struct ieee802_11_elems elems;
147 + struct ieee80211_mgmt *mgmt;
148 + struct sta_info *sta;
153 + enum ieee80211_band band = local->hw.conf.channel->band;
154 + struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
156 + rx_status = IEEE80211_SKB_RXCB(skb);
157 + mgmt = (struct ieee80211_mgmt *) skb->data;
158 + stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
160 + if (stype != IEEE80211_STYPE_BEACON)
163 + baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
164 + if (baselen > skb->len)
167 + ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
168 + skb->len - baselen, &elems);
170 + rates = ieee80211_sta_get_rates(local, &elems, band, NULL);
174 + sta = sta_info_get(sdata, sdata->u.wds.remote_addr);
178 + sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
186 + sta->last_rx = jiffies;
187 + sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
189 + if (elems.ht_cap_elem)
190 + ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
191 + elems.ht_cap_elem, &sta->sta.ht_cap);
193 + if (elems.wmm_param)
194 + set_sta_flag(sta, WLAN_STA_WME);
197 + sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
198 + sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
199 + sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
200 + rate_control_rate_init(sta);
201 + sta_info_insert_rcu(sta);
207 static void ieee80211_iface_work(struct work_struct *work)
209 struct ieee80211_sub_if_data *sdata =
210 @@ -1101,6 +1144,9 @@ static void ieee80211_iface_work(struct
212 ieee80211_mesh_rx_queued_mgmt(sdata, skb);
214 + case NL80211_IFTYPE_WDS:
215 + ieee80211_wds_rx_queued_mgmt(sdata, skb);
218 WARN(1, "frame for unexpected interface type");
220 --- a/net/mac80211/rx.c
221 +++ b/net/mac80211/rx.c
222 @@ -2279,6 +2279,7 @@ ieee80211_rx_h_action(struct ieee80211_r
223 sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
224 sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
225 sdata->vif.type != NL80211_IFTYPE_AP &&
226 + sdata->vif.type != NL80211_IFTYPE_WDS &&
227 sdata->vif.type != NL80211_IFTYPE_ADHOC)
230 @@ -2496,14 +2497,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
232 if (!ieee80211_vif_is_mesh(&sdata->vif) &&
233 sdata->vif.type != NL80211_IFTYPE_ADHOC &&
234 - sdata->vif.type != NL80211_IFTYPE_STATION)
235 + sdata->vif.type != NL80211_IFTYPE_STATION &&
236 + sdata->vif.type != NL80211_IFTYPE_WDS)
237 return RX_DROP_MONITOR;
240 case cpu_to_le16(IEEE80211_STYPE_AUTH):
241 case cpu_to_le16(IEEE80211_STYPE_BEACON):
242 case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
243 - /* process for all: mesh, mlme, ibss */
244 + /* process for all: mesh, mlme, ibss, wds */
246 case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
247 case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
248 @@ -2827,10 +2829,16 @@ static int prepare_for_handlers(struct i
251 case NL80211_IFTYPE_WDS:
252 - if (bssid || !ieee80211_is_data(hdr->frame_control))
254 if (!ether_addr_equal(sdata->u.wds.remote_addr, hdr->addr2))
257 + if (ieee80211_is_data(hdr->frame_control) ||
258 + ieee80211_is_action(hdr->frame_control)) {
259 + if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
261 + } else if (!ieee80211_is_beacon(hdr->frame_control))
265 case NL80211_IFTYPE_P2P_DEVICE:
266 if (!ieee80211_is_public_action(hdr, skb->len) &&
267 --- a/net/mac80211/sta_info.h
268 +++ b/net/mac80211/sta_info.h
270 * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
272 * @WLAN_STA_WME: Station is a QoS-STA.
273 - * @WLAN_STA_WDS: Station is one of our WDS peers.
274 * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
275 * IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
276 * frame to this station is transmitted.
277 @@ -64,7 +63,6 @@ enum ieee80211_sta_info_flags {
279 WLAN_STA_SHORT_PREAMBLE,
282 WLAN_STA_CLEAR_PS_FILT,
285 --- a/net/mac80211/status.c
286 +++ b/net/mac80211/status.c
287 @@ -34,7 +34,7 @@ void ieee80211_tx_status_irqsafe(struct
288 skb_queue_len(&local->skb_queue_unreliable);
289 while (tmp > IEEE80211_IRQSAFE_QUEUE_LIMIT &&
290 (skb = skb_dequeue(&local->skb_queue_unreliable))) {
291 - dev_kfree_skb_irq(skb);
292 + ieee80211_free_txskb(hw, skb);
294 I802_DEBUG_INC(local->tx_status_drop);
296 @@ -159,7 +159,7 @@ static void ieee80211_handle_filtered_fr
297 "dropped TX filtered frame, queue_len=%d PS=%d @%lu\n",
298 skb_queue_len(&sta->tx_filtered[ac]),
299 !!test_sta_flag(sta, WLAN_STA_PS_STA), jiffies);
300 - dev_kfree_skb(skb);
301 + ieee80211_free_txskb(&local->hw, skb);
304 static void ieee80211_check_pending_bar(struct sta_info *sta, u8 *addr, u8 tid)
305 @@ -324,6 +324,75 @@ static void ieee80211_add_tx_radiotap_he
309 +static void ieee80211_report_used_skb(struct ieee80211_local *local,
310 + struct sk_buff *skb, bool dropped)
312 + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
313 + struct ieee80211_hdr *hdr = (void *)skb->data;
314 + bool acked = info->flags & IEEE80211_TX_STAT_ACK;
319 + if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) {
320 + struct ieee80211_sub_if_data *sdata = NULL;
321 + struct ieee80211_sub_if_data *iter_sdata;
322 + u64 cookie = (unsigned long)skb;
327 + list_for_each_entry_rcu(iter_sdata, &local->interfaces,
329 + if (!iter_sdata->dev)
332 + if (skb->dev == iter_sdata->dev) {
333 + sdata = iter_sdata;
338 + sdata = rcu_dereference(local->p2p_sdata);
343 + else if (ieee80211_is_nullfunc(hdr->frame_control) ||
344 + ieee80211_is_qos_nullfunc(hdr->frame_control)) {
345 + cfg80211_probe_status(sdata->dev, hdr->addr1,
346 + cookie, acked, GFP_ATOMIC);
348 + cfg80211_mgmt_tx_status(&sdata->wdev, cookie, skb->data,
349 + skb->len, acked, GFP_ATOMIC);
355 + if (unlikely(info->ack_frame_id)) {
356 + struct sk_buff *ack_skb;
357 + unsigned long flags;
359 + spin_lock_irqsave(&local->ack_status_lock, flags);
360 + ack_skb = idr_find(&local->ack_status_frames,
361 + info->ack_frame_id);
363 + idr_remove(&local->ack_status_frames,
364 + info->ack_frame_id);
365 + spin_unlock_irqrestore(&local->ack_status_lock, flags);
369 + /* consumes ack_skb */
370 + skb_complete_wifi_ack(ack_skb, acked);
372 + dev_kfree_skb_any(ack_skb);
379 * Use a static threshold for now, best value to be determined
381 @@ -515,50 +584,7 @@ void ieee80211_tx_status(struct ieee8021
382 msecs_to_jiffies(10));
385 - if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) {
386 - u64 cookie = (unsigned long)skb;
387 - acked = info->flags & IEEE80211_TX_STAT_ACK;
389 - if (ieee80211_is_nullfunc(hdr->frame_control) ||
390 - ieee80211_is_qos_nullfunc(hdr->frame_control)) {
391 - cfg80211_probe_status(skb->dev, hdr->addr1,
392 - cookie, acked, GFP_ATOMIC);
393 - } else if (skb->dev) {
394 - cfg80211_mgmt_tx_status(
395 - skb->dev->ieee80211_ptr, cookie, skb->data,
396 - skb->len, acked, GFP_ATOMIC);
398 - struct ieee80211_sub_if_data *p2p_sdata;
402 - p2p_sdata = rcu_dereference(local->p2p_sdata);
404 - cfg80211_mgmt_tx_status(
405 - &p2p_sdata->wdev, cookie, skb->data,
406 - skb->len, acked, GFP_ATOMIC);
412 - if (unlikely(info->ack_frame_id)) {
413 - struct sk_buff *ack_skb;
414 - unsigned long flags;
416 - spin_lock_irqsave(&local->ack_status_lock, flags);
417 - ack_skb = idr_find(&local->ack_status_frames,
418 - info->ack_frame_id);
420 - idr_remove(&local->ack_status_frames,
421 - info->ack_frame_id);
422 - spin_unlock_irqrestore(&local->ack_status_lock, flags);
424 - /* consumes ack_skb */
426 - skb_complete_wifi_ack(ack_skb,
427 - info->flags & IEEE80211_TX_STAT_ACK);
429 + ieee80211_report_used_skb(local, skb, false);
431 /* this was a transmitted frame, but now we want to reuse it */
433 @@ -634,25 +660,17 @@ EXPORT_SYMBOL(ieee80211_report_low_ack);
434 void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb)
436 struct ieee80211_local *local = hw_to_local(hw);
437 - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
439 - if (unlikely(info->ack_frame_id)) {
440 - struct sk_buff *ack_skb;
441 - unsigned long flags;
443 - spin_lock_irqsave(&local->ack_status_lock, flags);
444 - ack_skb = idr_find(&local->ack_status_frames,
445 - info->ack_frame_id);
447 - idr_remove(&local->ack_status_frames,
448 - info->ack_frame_id);
449 - spin_unlock_irqrestore(&local->ack_status_lock, flags);
451 - /* consumes ack_skb */
453 - dev_kfree_skb_any(ack_skb);
456 + ieee80211_report_used_skb(local, skb, true);
457 dev_kfree_skb_any(skb);
459 EXPORT_SYMBOL(ieee80211_free_txskb);
461 +void ieee80211_purge_tx_queue(struct ieee80211_hw *hw,
462 + struct sk_buff_head *skbs)
464 + struct sk_buff *skb;
466 + while ((skb = __skb_dequeue(skbs)))
467 + ieee80211_free_txskb(hw, skb);
469 --- a/drivers/net/wireless/p54/main.c
470 +++ b/drivers/net/wireless/p54/main.c
471 @@ -139,6 +139,7 @@ static int p54_beacon_format_ie_tim(stru
472 static int p54_beacon_update(struct p54_common *priv,
473 struct ieee80211_vif *vif)
475 + struct ieee80211_tx_control control = { };
476 struct sk_buff *beacon;
479 @@ -158,7 +159,7 @@ static int p54_beacon_update(struct p54_
480 * to cancel the old beacon template by hand, instead the firmware
481 * will release the previous one through the feedback mechanism.
483 - p54_tx_80211(priv->hw, NULL, beacon);
484 + p54_tx_80211(priv->hw, &control, beacon);
485 priv->tsf_high32 = 0;
488 --- a/net/wireless/reg.c
489 +++ b/net/wireless/reg.c
490 @@ -352,6 +352,9 @@ static void reg_regdb_search(struct work
491 struct reg_regdb_search_request *request;
492 const struct ieee80211_regdomain *curdom, *regdom;
494 + bool set_reg = false;
496 + mutex_lock(&cfg80211_mutex);
498 mutex_lock(®_regdb_search_mutex);
499 while (!list_empty(®_regdb_search_list)) {
500 @@ -367,9 +370,7 @@ static void reg_regdb_search(struct work
501 r = reg_copy_regd(®dom, curdom);
504 - mutex_lock(&cfg80211_mutex);
505 - set_regdom(regdom);
506 - mutex_unlock(&cfg80211_mutex);
511 @@ -377,6 +378,11 @@ static void reg_regdb_search(struct work
514 mutex_unlock(®_regdb_search_mutex);
517 + set_regdom(regdom);
519 + mutex_unlock(&cfg80211_mutex);
522 static DECLARE_WORK(reg_regdb_work, reg_regdb_search);
523 --- a/drivers/net/wireless/ath/ath9k/recv.c
524 +++ b/drivers/net/wireless/ath/ath9k/recv.c
525 @@ -286,7 +286,6 @@ int ath_rx_init(struct ath_softc *sc, in
527 spin_lock_init(&sc->sc_pcu_lock);
528 spin_lock_init(&sc->rx.rxbuflock);
529 - clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
531 common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 +
532 sc->sc_ah->caps.rx_status_len;
533 @@ -424,8 +423,8 @@ u32 ath_calcrxfilter(struct ath_softc *s
534 rfilt |= ATH9K_RX_FILTER_COMP_BAR;
536 if (sc->nvifs > 1 || (sc->rx.rxfilter & FIF_OTHER_BSS)) {
537 - /* The following may also be needed for other older chips */
538 - if (sc->sc_ah->hw_version.macVersion == AR_SREV_VERSION_9160)
539 + /* This is needed for older chips */
540 + if (sc->sc_ah->hw_version.macVersion <= AR_SREV_VERSION_9160)
541 rfilt |= ATH9K_RX_FILTER_PROM;
542 rfilt |= ATH9K_RX_FILTER_MCAST_BCAST_ALL;
544 @@ -473,6 +472,13 @@ start_recv:
548 +static void ath_flushrecv(struct ath_softc *sc)
550 + if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
551 + ath_rx_tasklet(sc, 1, true);
552 + ath_rx_tasklet(sc, 1, false);
555 bool ath_stoprecv(struct ath_softc *sc)
557 struct ath_hw *ah = sc->sc_ah;
558 @@ -483,6 +489,8 @@ bool ath_stoprecv(struct ath_softc *sc)
559 ath9k_hw_setrxfilter(ah, 0);
560 stopped = ath9k_hw_stopdmarecv(ah, &reset);
564 if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
565 ath_edma_stop_recv(sc);
567 @@ -499,15 +507,6 @@ bool ath_stoprecv(struct ath_softc *sc)
568 return stopped && !reset;
571 -void ath_flushrecv(struct ath_softc *sc)
573 - set_bit(SC_OP_RXFLUSH, &sc->sc_flags);
574 - if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
575 - ath_rx_tasklet(sc, 1, true);
576 - ath_rx_tasklet(sc, 1, false);
577 - clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
580 static bool ath_beacon_dtim_pending_cab(struct sk_buff *skb)
582 /* Check whether the Beacon frame has DTIM indicating buffered bc/mc */
583 @@ -744,6 +743,7 @@ static struct ath_buf *ath_get_next_rx_b
587 + list_del(&bf->list);
591 @@ -1066,9 +1066,6 @@ int ath_rx_tasklet(struct ath_softc *sc,
594 bool decrypt_error = false;
595 - /* If handling rx interrupt and flush is in progress => exit */
596 - if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags) && (flush == 0))
599 memset(&rs, 0, sizeof(rs));
601 @@ -1108,15 +1105,6 @@ int ath_rx_tasklet(struct ath_softc *sc,
603 ath_debug_stat_rx(sc, &rs);
606 - * If we're asked to flush receive queue, directly
607 - * chain it back at the queue without processing it.
609 - if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags)) {
610 - RX_STAT_INC(rx_drop_rxflush);
611 - goto requeue_drop_frag;
614 memset(rxs, 0, sizeof(struct ieee80211_rx_status));
616 rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
617 @@ -1251,14 +1239,15 @@ requeue_drop_frag:
621 + list_add_tail(&bf->list, &sc->rx.rxbuf);
626 - list_add_tail(&bf->list, &sc->rx.rxbuf);
627 ath_rx_edma_buf_link(sc, qtype);
629 - list_move_tail(&bf->list, &sc->rx.rxbuf);
630 ath_rx_buf_link(sc, bf);
632 - ath9k_hw_rxena(ah);
633 + ath9k_hw_rxena(ah);
637 --- a/net/mac80211/mlme.c
638 +++ b/net/mac80211/mlme.c
639 @@ -818,23 +818,71 @@ void ieee80211_sta_process_chanswitch(st
642 static void ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata,
643 - u16 capab_info, u8 *pwr_constr_elem,
644 - u8 pwr_constr_elem_len)
645 + struct ieee80211_channel *channel,
646 + const u8 *country_ie, u8 country_ie_len,
647 + const u8 *pwr_constr_elem)
649 - struct ieee80211_conf *conf = &sdata->local->hw.conf;
650 + struct ieee80211_country_ie_triplet *triplet;
651 + int chan = ieee80211_frequency_to_channel(channel->center_freq);
652 + int i, chan_pwr, chan_increment, new_ap_level;
653 + bool have_chan_pwr = false;
655 - if (!(capab_info & WLAN_CAPABILITY_SPECTRUM_MGMT))
657 + if (country_ie_len % 2 || country_ie_len < IEEE80211_COUNTRY_IE_MIN_LEN)
660 - /* Power constraint IE length should be 1 octet */
661 - if (pwr_constr_elem_len != 1)
663 + triplet = (void *)(country_ie + 3);
664 + country_ie_len -= 3;
666 - if ((*pwr_constr_elem <= conf->channel->max_reg_power) &&
667 - (*pwr_constr_elem != sdata->local->power_constr_level)) {
668 - sdata->local->power_constr_level = *pwr_constr_elem;
669 - ieee80211_hw_config(sdata->local, 0);
670 + switch (channel->band) {
674 + case IEEE80211_BAND_2GHZ:
675 + case IEEE80211_BAND_60GHZ:
676 + chan_increment = 1;
678 + case IEEE80211_BAND_5GHZ:
679 + chan_increment = 4;
684 + while (country_ie_len >= 3) {
685 + u8 first_channel = triplet->chans.first_channel;
687 + if (first_channel >= IEEE80211_COUNTRY_EXTENSION_ID)
690 + for (i = 0; i < triplet->chans.num_channels; i++) {
691 + if (first_channel + i * chan_increment == chan) {
692 + have_chan_pwr = true;
693 + chan_pwr = triplet->chans.max_power;
702 + country_ie_len -= 3;
705 + if (!have_chan_pwr)
708 + new_ap_level = max_t(int, 0, chan_pwr - *pwr_constr_elem);
710 + if (sdata->local->ap_power_level == new_ap_level)
714 + "Limiting TX power to %d (%d - %d) dBm as advertised by %pM\n",
715 + new_ap_level, chan_pwr, *pwr_constr_elem,
716 + sdata->u.mgd.bssid);
717 + sdata->local->ap_power_level = new_ap_level;
718 + ieee80211_hw_config(sdata->local, 0);
721 void ieee80211_enable_dyn_ps(struct ieee80211_vif *vif)
722 @@ -1390,7 +1438,7 @@ static void ieee80211_set_disassoc(struc
723 sta = sta_info_get(sdata, ifmgd->bssid);
725 set_sta_flag(sta, WLAN_STA_BLOCK_BA);
726 - ieee80211_sta_tear_down_BA_sessions(sta, tx);
727 + ieee80211_sta_tear_down_BA_sessions(sta, false);
729 mutex_unlock(&local->sta_mtx);
731 @@ -1438,7 +1486,7 @@ static void ieee80211_set_disassoc(struc
732 memset(&ifmgd->ht_capa, 0, sizeof(ifmgd->ht_capa));
733 memset(&ifmgd->ht_capa_mask, 0, sizeof(ifmgd->ht_capa_mask));
735 - local->power_constr_level = 0;
736 + local->ap_power_level = 0;
738 del_timer_sync(&local->dynamic_ps_timer);
739 cancel_work_sync(&local->dynamic_ps_enable_work);
740 @@ -2530,15 +2578,13 @@ static void ieee80211_rx_mgmt_beacon(str
744 - /* Note: country IE parsing is done for us by cfg80211 */
745 - if (elems.country_elem) {
746 - /* TODO: IBSS also needs this */
747 - if (elems.pwr_constr_elem)
748 - ieee80211_handle_pwr_constr(sdata,
749 - le16_to_cpu(mgmt->u.probe_resp.capab_info),
750 - elems.pwr_constr_elem,
751 - elems.pwr_constr_elem_len);
753 + if (elems.country_elem && elems.pwr_constr_elem &&
754 + mgmt->u.probe_resp.capab_info &
755 + cpu_to_le16(WLAN_CAPABILITY_SPECTRUM_MGMT))
756 + ieee80211_handle_pwr_constr(sdata, local->oper_channel,
757 + elems.country_elem,
758 + elems.country_elem_len,
759 + elems.pwr_constr_elem);
761 ieee80211_bss_info_change_notify(sdata, changed);
763 @@ -3526,6 +3572,7 @@ int ieee80211_mgd_deauth(struct ieee8021
765 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
766 u8 frame_buf[DEAUTH_DISASSOC_LEN];
767 + bool tx = !req->local_state_change;
769 mutex_lock(&ifmgd->mtx);
771 @@ -3542,12 +3589,12 @@ int ieee80211_mgd_deauth(struct ieee8021
772 if (ifmgd->associated &&
773 ether_addr_equal(ifmgd->associated->bssid, req->bssid)) {
774 ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
775 - req->reason_code, true, frame_buf);
776 + req->reason_code, tx, frame_buf);
778 drv_mgd_prepare_tx(sdata->local, sdata);
779 ieee80211_send_deauth_disassoc(sdata, req->bssid,
780 IEEE80211_STYPE_DEAUTH,
781 - req->reason_code, true,
782 + req->reason_code, tx,
786 --- a/net/mac80211/sta_info.c
787 +++ b/net/mac80211/sta_info.c
788 @@ -585,7 +585,7 @@ static bool sta_info_cleanup_expire_buff
792 - dev_kfree_skb(skb);
793 + ieee80211_free_txskb(&local->hw, skb);
797 @@ -614,7 +614,7 @@ static bool sta_info_cleanup_expire_buff
798 local->total_ps_buffered--;
799 ps_dbg(sta->sdata, "Buffered frame expired (STA %pM)\n",
801 - dev_kfree_skb(skb);
802 + ieee80211_free_txskb(&local->hw, skb);
806 @@ -674,7 +674,7 @@ int __must_check __sta_info_destroy(stru
807 * will be sufficient.
809 set_sta_flag(sta, WLAN_STA_BLOCK_BA);
810 - ieee80211_sta_tear_down_BA_sessions(sta, true);
811 + ieee80211_sta_tear_down_BA_sessions(sta, false);
813 ret = sta_info_hash_del(local, sta);
815 @@ -730,8 +730,8 @@ int __must_check __sta_info_destroy(stru
817 for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
818 local->total_ps_buffered -= skb_queue_len(&sta->ps_tx_buf[ac]);
819 - __skb_queue_purge(&sta->ps_tx_buf[ac]);
820 - __skb_queue_purge(&sta->tx_filtered[ac]);
821 + ieee80211_purge_tx_queue(&local->hw, &sta->ps_tx_buf[ac]);
822 + ieee80211_purge_tx_queue(&local->hw, &sta->tx_filtered[ac]);
825 #ifdef CONFIG_MAC80211_MESH
826 @@ -765,7 +765,7 @@ int __must_check __sta_info_destroy(stru
827 tid_tx = rcu_dereference_raw(sta->ampdu_mlme.tid_tx[i]);
830 - __skb_queue_purge(&tid_tx->pending);
831 + ieee80211_purge_tx_queue(&local->hw, &tid_tx->pending);
835 --- a/drivers/net/wireless/ath/ath5k/phy.c
836 +++ b/drivers/net/wireless/ath/ath5k/phy.c
837 @@ -1977,11 +1977,13 @@ ath5k_hw_set_spur_mitigation_filter(stru
838 spur_delta_phase = (spur_offset << 18) / 25;
839 spur_freq_sigma_delta = (spur_delta_phase >> 10);
840 symbol_width = AR5K_SPUR_SYMBOL_WIDTH_BASE_100Hz / 2;
842 case AR5K_BWMODE_5MHZ:
843 /* Both sample_freq and chip_freq are 10MHz (?) */
844 spur_delta_phase = (spur_offset << 19) / 25;
845 spur_freq_sigma_delta = (spur_delta_phase >> 10);
846 symbol_width = AR5K_SPUR_SYMBOL_WIDTH_BASE_100Hz / 4;
849 if (channel->band == IEEE80211_BAND_5GHZ) {
850 /* Both sample_freq and chip_freq are 40MHz */
851 --- a/net/mac80211/ieee80211_i.h
852 +++ b/net/mac80211/ieee80211_i.h
853 @@ -1062,7 +1062,7 @@ struct ieee80211_local {
854 bool disable_dynamic_ps;
856 int user_power_level; /* in dBm */
857 - int power_constr_level; /* in dBm */
858 + int ap_power_level; /* in dBm */
860 enum ieee80211_smps_mode smps_mode;
862 @@ -1170,7 +1170,6 @@ struct ieee802_11_elems {
866 - u8 pwr_constr_elem_len;
868 u8 num_of_quiet_elem; /* can be more the one */
870 @@ -1318,6 +1317,8 @@ netdev_tx_t ieee80211_monitor_start_xmit
871 struct net_device *dev);
872 netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
873 struct net_device *dev);
874 +void ieee80211_purge_tx_queue(struct ieee80211_hw *hw,
875 + struct sk_buff_head *skbs);
878 void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata,
879 --- a/net/mac80211/util.c
880 +++ b/net/mac80211/util.c
881 @@ -406,7 +406,7 @@ void ieee80211_add_pending_skb(struct ie
882 int queue = info->hw_queue;
884 if (WARN_ON(!info->control.vif)) {
886 + ieee80211_free_txskb(&local->hw, skb);
890 @@ -431,7 +431,7 @@ void ieee80211_add_pending_skbs_fn(struc
891 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
893 if (WARN_ON(!info->control.vif)) {
895 + ieee80211_free_txskb(&local->hw, skb);
899 @@ -792,8 +792,11 @@ u32 ieee802_11_parse_elems_crc(u8 *start
900 elems->country_elem_len = elen;
902 case WLAN_EID_PWR_CONSTRAINT:
904 + elem_parse_failed = true;
907 elems->pwr_constr_elem = pos;
908 - elems->pwr_constr_elem_len = elen;
910 case WLAN_EID_TIMEOUT_INTERVAL:
911 elems->timeout_int = pos;
912 --- a/net/mac80211/main.c
913 +++ b/net/mac80211/main.c
914 @@ -154,13 +154,11 @@ int ieee80211_hw_config(struct ieee80211
916 if (test_bit(SCAN_SW_SCANNING, &local->scanning) ||
917 test_bit(SCAN_ONCHANNEL_SCANNING, &local->scanning) ||
918 - test_bit(SCAN_HW_SCANNING, &local->scanning))
919 + test_bit(SCAN_HW_SCANNING, &local->scanning) ||
920 + !local->ap_power_level)
921 power = chan->max_power;
923 - power = local->power_constr_level ?
924 - min(chan->max_power,
925 - (chan->max_reg_power - local->power_constr_level)) :
927 + power = min(chan->max_power, local->ap_power_level);
929 if (local->user_power_level >= 0)
930 power = min(power, local->user_power_level);
931 --- a/include/net/cfg80211.h
932 +++ b/include/net/cfg80211.h
933 @@ -1218,6 +1218,7 @@ struct cfg80211_deauth_request {
937 + bool local_state_change;
941 --- a/net/wireless/mlme.c
942 +++ b/net/wireless/mlme.c
943 @@ -457,20 +457,14 @@ int __cfg80211_mlme_deauth(struct cfg802
944 .reason_code = reason,
947 + .local_state_change = local_state_change,
950 ASSERT_WDEV_LOCK(wdev);
952 - if (local_state_change) {
953 - if (wdev->current_bss &&
954 - ether_addr_equal(wdev->current_bss->pub.bssid, bssid)) {
955 - cfg80211_unhold_bss(wdev->current_bss);
956 - cfg80211_put_bss(&wdev->current_bss->pub);
957 - wdev->current_bss = NULL;
960 + if (local_state_change && (!wdev->current_bss ||
961 + !ether_addr_equal(wdev->current_bss->pub.bssid, bssid)))
965 return rdev->ops->deauth(&rdev->wiphy, dev, &req);
967 --- a/drivers/net/wireless/ath/ath9k/xmit.c
968 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
969 @@ -386,7 +386,7 @@ static void ath_tx_complete_aggr(struct
970 u16 seq_st = 0, acked_cnt = 0, txfail_cnt = 0, seq_first;
971 u32 ba[WME_BA_BMP_SIZE >> 5];
972 int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0;
973 - bool rc_update = true;
974 + bool rc_update = true, isba;
975 struct ieee80211_tx_rate rates[4];
976 struct ath_frame_info *fi;
978 @@ -430,13 +430,17 @@ static void ath_tx_complete_aggr(struct
979 tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK;
980 tid = ATH_AN_2_TID(an, tidno);
981 seq_first = tid->seq_start;
982 + isba = ts->ts_flags & ATH9K_TX_BA;
985 * The hardware occasionally sends a tx status for the wrong TID.
986 * In this case, the BA status cannot be considered valid and all
987 * subframes need to be retransmitted
989 + * Only BlockAcks have a TID and therefore normal Acks cannot be
992 - if (tidno != ts->tid)
993 + if (isba && tidno != ts->tid)
996 isaggr = bf_isaggr(bf);
997 --- a/net/mac80211/cfg.c
998 +++ b/net/mac80211/cfg.c
999 @@ -2563,6 +2563,9 @@ static void ieee80211_mgmt_frame_registe
1001 local->probe_req_reg--;
1003 + if (!local->open_count)
1006 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
1009 --- a/net/mac80211/tx.c
1010 +++ b/net/mac80211/tx.c
1011 @@ -354,7 +354,7 @@ static void purge_old_ps_buffers(struct
1012 total += skb_queue_len(&sta->ps_tx_buf[ac]);
1015 - dev_kfree_skb(skb);
1016 + ieee80211_free_txskb(&local->hw, skb);
1020 @@ -466,7 +466,7 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
1022 "STA %pM TX buffer for AC %d full - dropping oldest frame\n",
1024 - dev_kfree_skb(old);
1025 + ieee80211_free_txskb(&local->hw, old);
1027 tx->local->total_ps_buffered++;
1029 @@ -1103,7 +1103,7 @@ static bool ieee80211_tx_prep_agg(struct
1030 spin_unlock(&tx->sta->lock);
1033 - dev_kfree_skb(purge_skb);
1034 + ieee80211_free_txskb(&tx->local->hw, purge_skb);
1037 /* reset session timer */
1038 @@ -1214,7 +1214,7 @@ static bool ieee80211_tx_frags(struct ie
1039 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
1040 if (WARN_ON_ONCE(q >= local->hw.queues)) {
1041 __skb_unlink(skb, skbs);
1042 - dev_kfree_skb(skb);
1043 + ieee80211_free_txskb(&local->hw, skb);
1047 @@ -1356,9 +1356,9 @@ static int invoke_tx_handlers(struct iee
1048 if (unlikely(res == TX_DROP)) {
1049 I802_DEBUG_INC(tx->local->tx_handlers_drop);
1051 - dev_kfree_skb(tx->skb);
1052 + ieee80211_free_txskb(&tx->local->hw, tx->skb);
1054 - __skb_queue_purge(&tx->skbs);
1055 + ieee80211_purge_tx_queue(&tx->local->hw, &tx->skbs);
1057 } else if (unlikely(res == TX_QUEUED)) {
1058 I802_DEBUG_INC(tx->local->tx_handlers_queued);
1059 @@ -1393,7 +1393,7 @@ static bool ieee80211_tx(struct ieee8021
1060 res_prepare = ieee80211_tx_prepare(sdata, &tx, skb);
1062 if (unlikely(res_prepare == TX_DROP)) {
1063 - dev_kfree_skb(skb);
1064 + ieee80211_free_txskb(&local->hw, skb);
1066 } else if (unlikely(res_prepare == TX_QUEUED)) {
1068 @@ -1465,7 +1465,7 @@ void ieee80211_xmit(struct ieee80211_sub
1069 headroom = max_t(int, 0, headroom);
1071 if (ieee80211_skb_resize(sdata, skb, headroom, may_encrypt)) {
1072 - dev_kfree_skb(skb);
1073 + ieee80211_free_txskb(&local->hw, skb);
1077 @@ -2056,8 +2056,10 @@ netdev_tx_t ieee80211_subif_start_xmit(s
1078 head_need += IEEE80211_ENCRYPT_HEADROOM;
1079 head_need += local->tx_headroom;
1080 head_need = max_t(int, 0, head_need);
1081 - if (ieee80211_skb_resize(sdata, skb, head_need, true))
1083 + if (ieee80211_skb_resize(sdata, skb, head_need, true)) {
1084 + ieee80211_free_txskb(&local->hw, skb);
1085 + return NETDEV_TX_OK;
1090 @@ -2124,10 +2126,13 @@ netdev_tx_t ieee80211_subif_start_xmit(s
1092 void ieee80211_clear_tx_pending(struct ieee80211_local *local)
1094 + struct sk_buff *skb;
1097 - for (i = 0; i < local->hw.queues; i++)
1098 - skb_queue_purge(&local->pending[i]);
1099 + for (i = 0; i < local->hw.queues; i++) {
1100 + while ((skb = skb_dequeue(&local->pending[i])) != NULL)
1101 + ieee80211_free_txskb(&local->hw, skb);
1106 @@ -2190,7 +2195,7 @@ void ieee80211_tx_pending(unsigned long
1107 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
1109 if (WARN_ON(!info->control.vif)) {
1111 + ieee80211_free_txskb(&local->hw, skb);
1115 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
1116 +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
1117 @@ -65,7 +65,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct
1118 u16 qnum = skb_get_queue_mapping(skb);
1120 if (WARN_ON(qnum >= ah->ah_capabilities.cap_queues.q_tx_num)) {
1121 - dev_kfree_skb_any(skb);
1122 + ieee80211_free_txskb(hw, skb);
1126 --- a/drivers/net/wireless/ath/ath9k/hw.c
1127 +++ b/drivers/net/wireless/ath/ath9k/hw.c
1128 @@ -2568,7 +2568,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw
1130 if (AR_SREV_9300_20_OR_LATER(ah)) {
1131 ah->enabled_cals |= TX_IQ_CAL;
1132 - if (AR_SREV_9485_OR_LATER(ah))
1133 + if (AR_SREV_9485_OR_LATER(ah) && !AR_SREV_9340(ah))
1134 ah->enabled_cals |= TX_IQ_ON_AGC_CAL;
1137 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
1138 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
1139 @@ -324,7 +324,6 @@ struct ath_rx {
1141 int ath_startrecv(struct ath_softc *sc);
1142 bool ath_stoprecv(struct ath_softc *sc);
1143 -void ath_flushrecv(struct ath_softc *sc);
1144 u32 ath_calcrxfilter(struct ath_softc *sc);
1145 int ath_rx_init(struct ath_softc *sc, int nbufs);
1146 void ath_rx_cleanup(struct ath_softc *sc);
1147 @@ -627,7 +626,6 @@ void ath_ant_comb_update(struct ath_soft
1155 --- a/drivers/net/wireless/ath/ath9k/beacon.c
1156 +++ b/drivers/net/wireless/ath/ath9k/beacon.c
1157 @@ -147,6 +147,7 @@ static struct ath_buf *ath9k_beacon_gene
1158 skb->len, DMA_TO_DEVICE);
1159 dev_kfree_skb_any(skb);
1160 bf->bf_buf_addr = 0;
1161 + bf->bf_mpdu = NULL;
1164 skb = ieee80211_beacon_get(hw, vif);
1165 @@ -359,7 +360,6 @@ void ath9k_beacon_tasklet(unsigned long
1168 bf = ath9k_beacon_generate(sc->hw, vif);
1171 if (sc->beacon.bmisscnt != 0) {
1172 ath_dbg(common, BSTUCK, "resume beacon xmit after %u misses\n",
1173 --- a/drivers/net/wireless/ath/ath9k/debug.c
1174 +++ b/drivers/net/wireless/ath/ath9k/debug.c
1175 @@ -919,7 +919,6 @@ static ssize_t read_file_recv(struct fil
1176 RXS_ERR("RX-LENGTH-ERR", rx_len_err);
1177 RXS_ERR("RX-OOM-ERR", rx_oom_err);
1178 RXS_ERR("RX-RATE-ERR", rx_rate_err);
1179 - RXS_ERR("RX-DROP-RXFLUSH", rx_drop_rxflush);
1180 RXS_ERR("RX-TOO-MANY-FRAGS", rx_too_many_frags_err);
1182 PHY_ERR("UNDERRUN ERR", ATH9K_PHYERR_UNDERRUN);
1183 --- a/drivers/net/wireless/ath/ath9k/debug.h
1184 +++ b/drivers/net/wireless/ath/ath9k/debug.h
1185 @@ -198,7 +198,6 @@ struct ath_tx_stats {
1186 * @rx_oom_err: No. of frames dropped due to OOM issues.
1187 * @rx_rate_err: No. of frames dropped due to rate errors.
1188 * @rx_too_many_frags_err: Frames dropped due to too-many-frags received.
1189 - * @rx_drop_rxflush: No. of frames dropped due to RX-FLUSH.
1190 * @rx_beacons: No. of beacons received.
1191 * @rx_frags: No. of rx-fragements received.
1193 @@ -217,7 +216,6 @@ struct ath_rx_stats {
1196 u32 rx_too_many_frags_err;
1197 - u32 rx_drop_rxflush;
1201 --- a/drivers/net/wireless/ath/ath9k/main.c
1202 +++ b/drivers/net/wireless/ath/ath9k/main.c
1203 @@ -181,7 +181,7 @@ static void ath_restart_work(struct ath_
1207 -static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
1208 +static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx)
1210 struct ath_hw *ah = sc->sc_ah;
1212 @@ -195,19 +195,15 @@ static bool ath_prepare_reset(struct ath
1213 ath9k_debug_samp_bb_mac(sc);
1214 ath9k_hw_disable_interrupts(ah);
1216 + tasklet_disable(&sc->intr_tq);
1218 if (!ath_stoprecv(sc))
1221 if (!ath_drain_all_txq(sc, retry_tx))
1225 - if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
1226 - ath_rx_tasklet(sc, 1, true);
1227 - ath_rx_tasklet(sc, 1, false);
1229 - ath_flushrecv(sc);
1231 + tasklet_enable(&sc->intr_tq);
1235 @@ -261,7 +257,6 @@ static int ath_reset_internal(struct ath
1236 struct ath_common *common = ath9k_hw_common(ah);
1237 struct ath9k_hw_cal_data *caldata = NULL;
1239 - bool flush = false;
1242 __ath_cancel_work(sc);
1243 @@ -275,11 +270,10 @@ static int ath_reset_internal(struct ath
1248 hchan = ah->curchan;
1251 - if (!ath_prepare_reset(sc, retry_tx, flush))
1252 + if (!ath_prepare_reset(sc, retry_tx))
1255 ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",
1256 @@ -821,7 +815,7 @@ static void ath9k_stop(struct ieee80211_
1257 ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
1260 - ath_prepare_reset(sc, false, true);
1261 + ath_prepare_reset(sc, false);
1264 dev_kfree_skb_any(sc->rx.frag);
1265 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
1266 +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
1267 @@ -893,7 +893,7 @@ static bool ar9003_hw_init_cal(struct at
1268 struct ath9k_hw_cal_data *caldata = ah->caldata;
1269 bool txiqcal_done = false, txclcal_done = false;
1270 bool is_reusable = true, status = true;
1271 - bool run_rtt_cal = false, run_agc_cal;
1272 + bool run_rtt_cal = false, run_agc_cal, sep_iq_cal = false;
1273 bool rtt = !!(ah->caps.hw_caps & ATH9K_HW_CAP_RTT);
1274 u32 agc_ctrl = 0, agc_supp_cals = AR_PHY_AGC_CONTROL_OFFSET_CAL |
1275 AR_PHY_AGC_CONTROL_FLTR_CAL |
1276 @@ -939,7 +939,8 @@ static bool ar9003_hw_init_cal(struct at
1280 - if (!(ah->enabled_cals & TX_IQ_CAL))
1281 + if ((IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan)) ||
1282 + !(ah->enabled_cals & TX_IQ_CAL))
1285 /* Do Tx IQ Calibration */
1286 @@ -959,21 +960,22 @@ static bool ar9003_hw_init_cal(struct at
1287 REG_CLR_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0,
1288 AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL);
1289 txiqcal_done = run_agc_cal = true;
1290 - goto skip_tx_iqcal;
1291 - } else if (caldata && !caldata->done_txiqcal_once)
1292 + } else if (caldata && !caldata->done_txiqcal_once) {
1294 + sep_iq_cal = true;
1298 if (ath9k_hw_mci_is_enabled(ah) && IS_CHAN_2GHZ(chan) && run_agc_cal)
1299 ar9003_mci_init_cal_req(ah, &is_reusable);
1301 - if (!(IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan))) {
1303 txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);
1304 REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
1306 REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
1310 if (run_agc_cal || !(ah->ah_flags & AH_FASTCC)) {
1311 /* Calibrate the AGC */
1312 REG_WRITE(ah, AR_PHY_AGC_CONTROL,
1313 --- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
1314 +++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
1315 @@ -744,6 +744,186 @@ static const u32 ar9300Modes_high_ob_db_
1316 {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1319 +static const u32 ar9300Modes_mixed_ob_db_tx_gain_table_2p2[][5] = {
1320 + /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
1321 + {0x0000a2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
1322 + {0x0000a2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
1323 + {0x0000a2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
1324 + {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1325 + {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
1326 + {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1327 + {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
1328 + {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
1329 + {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
1330 + {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
1331 + {0x0000a514, 0x1c000223, 0x1c000223, 0x11000400, 0x11000400},
1332 + {0x0000a518, 0x21002220, 0x21002220, 0x15000402, 0x15000402},
1333 + {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
1334 + {0x0000a520, 0x2b022220, 0x2b022220, 0x1b000603, 0x1b000603},
1335 + {0x0000a524, 0x2f022222, 0x2f022222, 0x1f000a02, 0x1f000a02},
1336 + {0x0000a528, 0x34022225, 0x34022225, 0x23000a04, 0x23000a04},
1337 + {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x26000a20, 0x26000a20},
1338 + {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2a000e20, 0x2a000e20},
1339 + {0x0000a534, 0x4202242a, 0x4202242a, 0x2e000e22, 0x2e000e22},
1340 + {0x0000a538, 0x4702244a, 0x4702244a, 0x31000e24, 0x31000e24},
1341 + {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x34001640, 0x34001640},
1342 + {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38001660, 0x38001660},
1343 + {0x0000a544, 0x52022470, 0x52022470, 0x3b001861, 0x3b001861},
1344 + {0x0000a548, 0x55022490, 0x55022490, 0x3e001a81, 0x3e001a81},
1345 + {0x0000a54c, 0x59022492, 0x59022492, 0x42001a83, 0x42001a83},
1346 + {0x0000a550, 0x5d022692, 0x5d022692, 0x44001c84, 0x44001c84},
1347 + {0x0000a554, 0x61022892, 0x61022892, 0x48001ce3, 0x48001ce3},
1348 + {0x0000a558, 0x65024890, 0x65024890, 0x4c001ce5, 0x4c001ce5},
1349 + {0x0000a55c, 0x69024892, 0x69024892, 0x50001ce9, 0x50001ce9},
1350 + {0x0000a560, 0x6e024c92, 0x6e024c92, 0x54001ceb, 0x54001ceb},
1351 + {0x0000a564, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1352 + {0x0000a568, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1353 + {0x0000a56c, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1354 + {0x0000a570, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1355 + {0x0000a574, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1356 + {0x0000a578, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1357 + {0x0000a57c, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1358 + {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
1359 + {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
1360 + {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
1361 + {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
1362 + {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
1363 + {0x0000a594, 0x1c800223, 0x1c800223, 0x11800400, 0x11800400},
1364 + {0x0000a598, 0x21802220, 0x21802220, 0x15800402, 0x15800402},
1365 + {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
1366 + {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800603, 0x1b800603},
1367 + {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800a02, 0x1f800a02},
1368 + {0x0000a5a8, 0x34822225, 0x34822225, 0x23800a04, 0x23800a04},
1369 + {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x26800a20, 0x26800a20},
1370 + {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2a800e20, 0x2a800e20},
1371 + {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2e800e22, 0x2e800e22},
1372 + {0x0000a5b8, 0x4782244a, 0x4782244a, 0x31800e24, 0x31800e24},
1373 + {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x34801640, 0x34801640},
1374 + {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38801660, 0x38801660},
1375 + {0x0000a5c4, 0x52822470, 0x52822470, 0x3b801861, 0x3b801861},
1376 + {0x0000a5c8, 0x55822490, 0x55822490, 0x3e801a81, 0x3e801a81},
1377 + {0x0000a5cc, 0x59822492, 0x59822492, 0x42801a83, 0x42801a83},
1378 + {0x0000a5d0, 0x5d822692, 0x5d822692, 0x44801c84, 0x44801c84},
1379 + {0x0000a5d4, 0x61822892, 0x61822892, 0x48801ce3, 0x48801ce3},
1380 + {0x0000a5d8, 0x65824890, 0x65824890, 0x4c801ce5, 0x4c801ce5},
1381 + {0x0000a5dc, 0x69824892, 0x69824892, 0x50801ce9, 0x50801ce9},
1382 + {0x0000a5e0, 0x6e824c92, 0x6e824c92, 0x54801ceb, 0x54801ceb},
1383 + {0x0000a5e4, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1384 + {0x0000a5e8, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1385 + {0x0000a5ec, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1386 + {0x0000a5f0, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1387 + {0x0000a5f4, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1388 + {0x0000a5f8, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1389 + {0x0000a5fc, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1390 + {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1391 + {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1392 + {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1393 + {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1394 + {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1395 + {0x0000a614, 0x02004000, 0x02004000, 0x01404000, 0x01404000},
1396 + {0x0000a618, 0x02004801, 0x02004801, 0x01404501, 0x01404501},
1397 + {0x0000a61c, 0x02808a02, 0x02808a02, 0x02008501, 0x02008501},
1398 + {0x0000a620, 0x0380ce03, 0x0380ce03, 0x0280ca03, 0x0280ca03},
1399 + {0x0000a624, 0x04411104, 0x04411104, 0x03010c04, 0x03010c04},
1400 + {0x0000a628, 0x04411104, 0x04411104, 0x04014c04, 0x04014c04},
1401 + {0x0000a62c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
1402 + {0x0000a630, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
1403 + {0x0000a634, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
1404 + {0x0000a638, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
1405 + {0x0000a63c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
1406 + {0x0000b2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
1407 + {0x0000b2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
1408 + {0x0000b2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
1409 + {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1410 + {0x0000c2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
1411 + {0x0000c2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
1412 + {0x0000c2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
1413 + {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1414 + {0x00016044, 0x012492d4, 0x012492d4, 0x056db2e4, 0x056db2e4},
1415 + {0x00016048, 0x66480001, 0x66480001, 0x8e480001, 0x8e480001},
1416 + {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1417 + {0x00016444, 0x012492d4, 0x012492d4, 0x056db2e4, 0x056db2e4},
1418 + {0x00016448, 0x66480001, 0x66480001, 0x8e480001, 0x8e480001},
1419 + {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1420 + {0x00016844, 0x012492d4, 0x012492d4, 0x056db2e4, 0x056db2e4},
1421 + {0x00016848, 0x66480001, 0x66480001, 0x8e480001, 0x8e480001},
1422 + {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1425 +static const u32 ar9300Modes_type5_tx_gain_table_2p2[][5] = {
1426 + /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
1427 + {0x0000a2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
1428 + {0x0000a2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
1429 + {0x0000a2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
1430 + {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1431 + {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
1432 + {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1433 + {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
1434 + {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
1435 + {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
1436 + {0x0000a510, 0x15000028, 0x15000028, 0x0f000202, 0x0f000202},
1437 + {0x0000a514, 0x1b00002b, 0x1b00002b, 0x12000400, 0x12000400},
1438 + {0x0000a518, 0x1f020028, 0x1f020028, 0x16000402, 0x16000402},
1439 + {0x0000a51c, 0x2502002b, 0x2502002b, 0x19000404, 0x19000404},
1440 + {0x0000a520, 0x2a04002a, 0x2a04002a, 0x1c000603, 0x1c000603},
1441 + {0x0000a524, 0x2e06002a, 0x2e06002a, 0x21000a02, 0x21000a02},
1442 + {0x0000a528, 0x3302202d, 0x3302202d, 0x25000a04, 0x25000a04},
1443 + {0x0000a52c, 0x3804202c, 0x3804202c, 0x28000a20, 0x28000a20},
1444 + {0x0000a530, 0x3c06202c, 0x3c06202c, 0x2c000e20, 0x2c000e20},
1445 + {0x0000a534, 0x4108202d, 0x4108202d, 0x30000e22, 0x30000e22},
1446 + {0x0000a538, 0x4506402d, 0x4506402d, 0x34000e24, 0x34000e24},
1447 + {0x0000a53c, 0x4906222d, 0x4906222d, 0x38001640, 0x38001640},
1448 + {0x0000a540, 0x4d062231, 0x4d062231, 0x3c001660, 0x3c001660},
1449 + {0x0000a544, 0x50082231, 0x50082231, 0x3f001861, 0x3f001861},
1450 + {0x0000a548, 0x5608422e, 0x5608422e, 0x43001a81, 0x43001a81},
1451 + {0x0000a54c, 0x5e08442e, 0x5e08442e, 0x47001a83, 0x47001a83},
1452 + {0x0000a550, 0x620a4431, 0x620a4431, 0x4a001c84, 0x4a001c84},
1453 + {0x0000a554, 0x640a4432, 0x640a4432, 0x4e001ce3, 0x4e001ce3},
1454 + {0x0000a558, 0x680a4434, 0x680a4434, 0x52001ce5, 0x52001ce5},
1455 + {0x0000a55c, 0x6c0a6434, 0x6c0a6434, 0x56001ce9, 0x56001ce9},
1456 + {0x0000a560, 0x6f0a6633, 0x6f0a6633, 0x5a001ceb, 0x5a001ceb},
1457 + {0x0000a564, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1458 + {0x0000a568, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1459 + {0x0000a56c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1460 + {0x0000a570, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1461 + {0x0000a574, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1462 + {0x0000a578, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1463 + {0x0000a57c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1464 + {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1465 + {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1466 + {0x0000a608, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
1467 + {0x0000a60c, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
1468 + {0x0000a610, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
1469 + {0x0000a614, 0x01804601, 0x01804601, 0x01404000, 0x01404000},
1470 + {0x0000a618, 0x01804601, 0x01804601, 0x01404501, 0x01404501},
1471 + {0x0000a61c, 0x01804601, 0x01804601, 0x02008501, 0x02008501},
1472 + {0x0000a620, 0x03408d02, 0x03408d02, 0x0280ca03, 0x0280ca03},
1473 + {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
1474 + {0x0000a628, 0x03410d04, 0x03410d04, 0x04014c04, 0x04014c04},
1475 + {0x0000a62c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1476 + {0x0000a630, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1477 + {0x0000a634, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1478 + {0x0000a638, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1479 + {0x0000a63c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1480 + {0x0000b2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
1481 + {0x0000b2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
1482 + {0x0000b2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
1483 + {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1484 + {0x0000c2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
1485 + {0x0000c2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
1486 + {0x0000c2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
1487 + {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1488 + {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
1489 + {0x00016048, 0x65240001, 0x65240001, 0x66480001, 0x66480001},
1490 + {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1491 + {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
1492 + {0x00016448, 0x65240001, 0x65240001, 0x66480001, 0x66480001},
1493 + {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1494 + {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
1495 + {0x00016848, 0x65240001, 0x65240001, 0x66480001, 0x66480001},
1496 + {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1499 static const u32 ar9300Common_rx_gain_table_2p2[][2] = {
1501 {0x0000a000, 0x00010000},
1502 --- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
1503 +++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
1504 @@ -459,28 +459,59 @@ static void ar9003_tx_gain_table_mode4(s
1505 else if (AR_SREV_9580(ah))
1506 INIT_INI_ARRAY(&ah->iniModesTxGain,
1507 ar9580_1p0_mixed_ob_db_tx_gain_table);
1509 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1510 + ar9300Modes_mixed_ob_db_tx_gain_table_2p2);
1513 +static void ar9003_tx_gain_table_mode5(struct ath_hw *ah)
1515 + if (AR_SREV_9485_11(ah))
1516 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1517 + ar9485Modes_green_ob_db_tx_gain_1_1);
1518 + else if (AR_SREV_9340(ah))
1519 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1520 + ar9340Modes_ub124_tx_gain_table_1p0);
1521 + else if (AR_SREV_9580(ah))
1522 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1523 + ar9580_1p0_type5_tx_gain_table);
1524 + else if (AR_SREV_9300_22(ah))
1525 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1526 + ar9300Modes_type5_tx_gain_table_2p2);
1529 +static void ar9003_tx_gain_table_mode6(struct ath_hw *ah)
1531 + if (AR_SREV_9340(ah))
1532 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1533 + ar9340Modes_low_ob_db_and_spur_tx_gain_table_1p0);
1534 + else if (AR_SREV_9485_11(ah))
1535 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1536 + ar9485Modes_green_spur_ob_db_tx_gain_1_1);
1537 + else if (AR_SREV_9580(ah))
1538 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1539 + ar9580_1p0_type6_tx_gain_table);
1542 +typedef void (*ath_txgain_tab)(struct ath_hw *ah);
1544 static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
1546 - switch (ar9003_hw_get_tx_gain_idx(ah)) {
1549 - ar9003_tx_gain_table_mode0(ah);
1552 - ar9003_tx_gain_table_mode1(ah);
1555 - ar9003_tx_gain_table_mode2(ah);
1558 - ar9003_tx_gain_table_mode3(ah);
1561 - ar9003_tx_gain_table_mode4(ah);
1564 + static const ath_txgain_tab modes[] = {
1565 + ar9003_tx_gain_table_mode0,
1566 + ar9003_tx_gain_table_mode1,
1567 + ar9003_tx_gain_table_mode2,
1568 + ar9003_tx_gain_table_mode3,
1569 + ar9003_tx_gain_table_mode4,
1570 + ar9003_tx_gain_table_mode5,
1571 + ar9003_tx_gain_table_mode6,
1573 + int idx = ar9003_hw_get_tx_gain_idx(ah);
1575 + if (idx >= ARRAY_SIZE(modes))
1581 static void ar9003_rx_gain_table_mode0(struct ath_hw *ah)
1582 --- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
1583 +++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
1584 @@ -1170,6 +1170,106 @@ static const u32 ar9340Modes_mixed_ob_db
1585 {0x00016448, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
1588 +static const u32 ar9340Modes_low_ob_db_and_spur_tx_gain_table_1p0[][5] = {
1589 + /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
1590 + {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03eaac5a, 0x03eaac5a},
1591 + {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03f330ac, 0x03f330ac},
1592 + {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03fc3f00, 0x03fc3f00},
1593 + {0x0000a2e8, 0x00000000, 0x00000000, 0x03ffc000, 0x03ffc000},
1594 + {0x0000a394, 0x00000444, 0x00000444, 0x00000404, 0x00000404},
1595 + {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
1596 + {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1597 + {0x0000a504, 0x06000003, 0x06000003, 0x02000001, 0x02000001},
1598 + {0x0000a508, 0x0a000020, 0x0a000020, 0x05000003, 0x05000003},
1599 + {0x0000a50c, 0x10000023, 0x10000023, 0x0a000005, 0x0a000005},
1600 + {0x0000a510, 0x16000220, 0x16000220, 0x0e000201, 0x0e000201},
1601 + {0x0000a514, 0x1c000223, 0x1c000223, 0x11000203, 0x11000203},
1602 + {0x0000a518, 0x21002220, 0x21002220, 0x14000401, 0x14000401},
1603 + {0x0000a51c, 0x27002223, 0x27002223, 0x18000403, 0x18000403},
1604 + {0x0000a520, 0x2b022220, 0x2b022220, 0x1b000602, 0x1b000602},
1605 + {0x0000a524, 0x2f022222, 0x2f022222, 0x1f000802, 0x1f000802},
1606 + {0x0000a528, 0x34022225, 0x34022225, 0x21000620, 0x21000620},
1607 + {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x25000820, 0x25000820},
1608 + {0x0000a530, 0x3e02222c, 0x3e02222c, 0x29000822, 0x29000822},
1609 + {0x0000a534, 0x4202242a, 0x4202242a, 0x2d000824, 0x2d000824},
1610 + {0x0000a538, 0x4702244a, 0x4702244a, 0x30000828, 0x30000828},
1611 + {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x3400082a, 0x3400082a},
1612 + {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38000849, 0x38000849},
1613 + {0x0000a544, 0x5302266c, 0x5302266c, 0x3b000a2c, 0x3b000a2c},
1614 + {0x0000a548, 0x5702286c, 0x5702286c, 0x3e000e2b, 0x3e000e2b},
1615 + {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x42000e2d, 0x42000e2d},
1616 + {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4500124a, 0x4500124a},
1617 + {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4900124c, 0x4900124c},
1618 + {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x4c00126c, 0x4c00126c},
1619 + {0x0000a55c, 0x7002708c, 0x7002708c, 0x4f00128c, 0x4f00128c},
1620 + {0x0000a560, 0x7302b08a, 0x7302b08a, 0x52001290, 0x52001290},
1621 + {0x0000a564, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1622 + {0x0000a568, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1623 + {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1624 + {0x0000a570, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1625 + {0x0000a574, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1626 + {0x0000a578, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1627 + {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1628 + {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
1629 + {0x0000a584, 0x06800003, 0x06800003, 0x02800001, 0x02800001},
1630 + {0x0000a588, 0x0a800020, 0x0a800020, 0x05800003, 0x05800003},
1631 + {0x0000a58c, 0x10800023, 0x10800023, 0x0a800005, 0x0a800005},
1632 + {0x0000a590, 0x16800220, 0x16800220, 0x0e800201, 0x0e800201},
1633 + {0x0000a594, 0x1c800223, 0x1c800223, 0x11800203, 0x11800203},
1634 + {0x0000a598, 0x21820220, 0x21820220, 0x14800401, 0x14800401},
1635 + {0x0000a59c, 0x27820223, 0x27820223, 0x18800403, 0x18800403},
1636 + {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800602, 0x1b800602},
1637 + {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800802, 0x1f800802},
1638 + {0x0000a5a8, 0x34822225, 0x34822225, 0x21800620, 0x21800620},
1639 + {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x25800820, 0x25800820},
1640 + {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x29800822, 0x29800822},
1641 + {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2d800824, 0x2d800824},
1642 + {0x0000a5b8, 0x4782244a, 0x4782244a, 0x30800828, 0x30800828},
1643 + {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x3480082a, 0x3480082a},
1644 + {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38800849, 0x38800849},
1645 + {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3b800a2c, 0x3b800a2c},
1646 + {0x0000a5c8, 0x5782286c, 0x5782286c, 0x3e800e2b, 0x3e800e2b},
1647 + {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x42800e2d, 0x42800e2d},
1648 + {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x4580124a, 0x4580124a},
1649 + {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x4980124c, 0x4980124c},
1650 + {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x4c80126c, 0x4c80126c},
1651 + {0x0000a5dc, 0x7086308c, 0x7086308c, 0x4f80128c, 0x4f80128c},
1652 + {0x0000a5e0, 0x738a308a, 0x738a308a, 0x52801290, 0x52801290},
1653 + {0x0000a5e4, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1654 + {0x0000a5e8, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1655 + {0x0000a5ec, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1656 + {0x0000a5f0, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1657 + {0x0000a5f4, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1658 + {0x0000a5f8, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1659 + {0x0000a5fc, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1660 + {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1661 + {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1662 + {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1663 + {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1664 + {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1665 + {0x0000a614, 0x01404000, 0x01404000, 0x01404501, 0x01404501},
1666 + {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
1667 + {0x0000a61c, 0x02008802, 0x02008802, 0x01404501, 0x01404501},
1668 + {0x0000a620, 0x0300cc03, 0x0300cc03, 0x03c0cf02, 0x03c0cf02},
1669 + {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03c0cf03, 0x03c0cf03},
1670 + {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04011004, 0x04011004},
1671 + {0x0000a62c, 0x03810c03, 0x03810c03, 0x05419405, 0x05419405},
1672 + {0x0000a630, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
1673 + {0x0000a634, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
1674 + {0x0000a638, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
1675 + {0x0000a63c, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
1676 + {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03eaac5a, 0x03eaac5a},
1677 + {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03f330ac, 0x03f330ac},
1678 + {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03fc3f00, 0x03fc3f00},
1679 + {0x0000b2e8, 0x00000000, 0x00000000, 0x03ffc000, 0x03ffc000},
1680 + {0x00016044, 0x022492db, 0x022492db, 0x022492db, 0x022492db},
1681 + {0x00016048, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
1682 + {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
1683 + {0x00016288, 0xf0318000, 0xf0318000, 0xf0318000, 0xf0318000},
1684 + {0x00016444, 0x022492db, 0x022492db, 0x022492db, 0x022492db},
1685 + {0x00016448, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
1688 static const u32 ar9340_1p0_mac_core[][2] = {
1690 {0x00000008, 0x00000000},
1691 --- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
1692 +++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
1693 @@ -234,12 +234,158 @@ static const u32 ar9485Modes_high_power_
1694 {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
1697 +static const u32 ar9485Modes_green_ob_db_tx_gain_1_1[][5] = {
1698 + /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
1699 + {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
1700 + {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
1701 + {0x0000a458, 0x80000000, 0x80000000, 0x80000000, 0x80000000},
1702 + {0x0000a500, 0x00022200, 0x00022200, 0x00000006, 0x00000006},
1703 + {0x0000a504, 0x05062002, 0x05062002, 0x03000201, 0x03000201},
1704 + {0x0000a508, 0x0c002e00, 0x0c002e00, 0x06000203, 0x06000203},
1705 + {0x0000a50c, 0x11062202, 0x11062202, 0x0a000401, 0x0a000401},
1706 + {0x0000a510, 0x17022e00, 0x17022e00, 0x0e000403, 0x0e000403},
1707 + {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x12000405, 0x12000405},
1708 + {0x0000a518, 0x25020ec0, 0x25020ec0, 0x15000604, 0x15000604},
1709 + {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x18000605, 0x18000605},
1710 + {0x0000a520, 0x2f001f04, 0x2f001f04, 0x1c000a04, 0x1c000a04},
1711 + {0x0000a524, 0x35001fc4, 0x35001fc4, 0x21000a06, 0x21000a06},
1712 + {0x0000a528, 0x3c022f04, 0x3c022f04, 0x29000a24, 0x29000a24},
1713 + {0x0000a52c, 0x41023e85, 0x41023e85, 0x2f000e21, 0x2f000e21},
1714 + {0x0000a530, 0x48023ec6, 0x48023ec6, 0x31000e20, 0x31000e20},
1715 + {0x0000a534, 0x4d023f01, 0x4d023f01, 0x33000e20, 0x33000e20},
1716 + {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
1717 + {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
1718 + {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
1719 + {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
1720 + {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
1721 + {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
1722 + {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
1723 + {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
1724 + {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
1725 + {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
1726 + {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
1727 + {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
1728 + {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1729 + {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1730 + {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1731 + {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1732 + {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1733 + {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1734 + {0x0000b500, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1735 + {0x0000b504, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1736 + {0x0000b508, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1737 + {0x0000b50c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1738 + {0x0000b510, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1739 + {0x0000b514, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1740 + {0x0000b518, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1741 + {0x0000b51c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1742 + {0x0000b520, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1743 + {0x0000b524, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1744 + {0x0000b528, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1745 + {0x0000b52c, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a},
1746 + {0x0000b530, 0x0000003a, 0x0000003a, 0x0000003a, 0x0000003a},
1747 + {0x0000b534, 0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a},
1748 + {0x0000b538, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1749 + {0x0000b53c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1750 + {0x0000b540, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1751 + {0x0000b544, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1752 + {0x0000b548, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1753 + {0x0000b54c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1754 + {0x0000b550, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1755 + {0x0000b554, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1756 + {0x0000b558, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1757 + {0x0000b55c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1758 + {0x0000b560, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1759 + {0x0000b564, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1760 + {0x0000b568, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1761 + {0x0000b56c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1762 + {0x0000b570, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1763 + {0x0000b574, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1764 + {0x0000b578, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1765 + {0x0000b57c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1766 + {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
1767 + {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
1770 #define ar9485Modes_high_ob_db_tx_gain_1_1 ar9485Modes_high_power_tx_gain_1_1
1772 #define ar9485Modes_low_ob_db_tx_gain_1_1 ar9485Modes_high_ob_db_tx_gain_1_1
1774 #define ar9485_modes_lowest_ob_db_tx_gain_1_1 ar9485Modes_low_ob_db_tx_gain_1_1
1776 +static const u32 ar9485Modes_green_spur_ob_db_tx_gain_1_1[][5] = {
1777 + /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
1778 + {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
1779 + {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
1780 + {0x0000a458, 0x80000000, 0x80000000, 0x80000000, 0x80000000},
1781 + {0x0000a500, 0x00022200, 0x00022200, 0x00000006, 0x00000006},
1782 + {0x0000a504, 0x05062002, 0x05062002, 0x03000201, 0x03000201},
1783 + {0x0000a508, 0x0c002e00, 0x0c002e00, 0x07000203, 0x07000203},
1784 + {0x0000a50c, 0x11062202, 0x11062202, 0x0a000401, 0x0a000401},
1785 + {0x0000a510, 0x17022e00, 0x17022e00, 0x0e000403, 0x0e000403},
1786 + {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x12000405, 0x12000405},
1787 + {0x0000a518, 0x25020ec0, 0x25020ec0, 0x14000406, 0x14000406},
1788 + {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1800040a, 0x1800040a},
1789 + {0x0000a520, 0x2f001f04, 0x2f001f04, 0x1c000460, 0x1c000460},
1790 + {0x0000a524, 0x35001fc4, 0x35001fc4, 0x22000463, 0x22000463},
1791 + {0x0000a528, 0x3c022f04, 0x3c022f04, 0x26000465, 0x26000465},
1792 + {0x0000a52c, 0x41023e85, 0x41023e85, 0x2e0006e0, 0x2e0006e0},
1793 + {0x0000a530, 0x48023ec6, 0x48023ec6, 0x310006e0, 0x310006e0},
1794 + {0x0000a534, 0x4d023f01, 0x4d023f01, 0x330006e0, 0x330006e0},
1795 + {0x0000a538, 0x53023f4b, 0x53023f4b, 0x3e0008e3, 0x3e0008e3},
1796 + {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x410008e5, 0x410008e5},
1797 + {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x430008e6, 0x430008e6},
1798 + {0x0000a544, 0x6502feca, 0x6502feca, 0x4a0008ec, 0x4a0008ec},
1799 + {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4e0008f1, 0x4e0008f1},
1800 + {0x0000a54c, 0x7203feca, 0x7203feca, 0x520008f3, 0x520008f3},
1801 + {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x54000eed, 0x54000eed},
1802 + {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x58000ef1, 0x58000ef1},
1803 + {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5c000ef3, 0x5c000ef3},
1804 + {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x60000ef5, 0x60000ef5},
1805 + {0x0000a560, 0x900fff0b, 0x900fff0b, 0x62000ef6, 0x62000ef6},
1806 + {0x0000a564, 0x960fffcb, 0x960fffcb, 0x62000ef6, 0x62000ef6},
1807 + {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
1808 + {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
1809 + {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
1810 + {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
1811 + {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
1812 + {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
1813 + {0x0000b500, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1814 + {0x0000b504, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1815 + {0x0000b508, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1816 + {0x0000b50c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1817 + {0x0000b510, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1818 + {0x0000b514, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1819 + {0x0000b518, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1820 + {0x0000b51c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1821 + {0x0000b520, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1822 + {0x0000b524, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1823 + {0x0000b528, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1824 + {0x0000b52c, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a},
1825 + {0x0000b530, 0x0000003a, 0x0000003a, 0x0000003a, 0x0000003a},
1826 + {0x0000b534, 0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a},
1827 + {0x0000b538, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1828 + {0x0000b53c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1829 + {0x0000b540, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1830 + {0x0000b544, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1831 + {0x0000b548, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1832 + {0x0000b54c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1833 + {0x0000b550, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1834 + {0x0000b554, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1835 + {0x0000b558, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1836 + {0x0000b55c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1837 + {0x0000b560, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1838 + {0x0000b564, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1839 + {0x0000b568, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1840 + {0x0000b56c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1841 + {0x0000b570, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1842 + {0x0000b574, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1843 + {0x0000b578, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1844 + {0x0000b57c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1845 + {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
1846 + {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
1849 static const u32 ar9485_1_1[][2] = {
1851 {0x0000a580, 0x00000000},
1852 --- a/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
1853 +++ b/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
1854 @@ -685,6 +685,82 @@ static const u32 ar9580_1p0_mixed_ob_db_
1856 #define ar9580_1p0_high_ob_db_tx_gain_table ar9300Modes_high_ob_db_tx_gain_table_2p2
1858 +#define ar9580_1p0_type5_tx_gain_table ar9300Modes_type5_tx_gain_table_2p2
1860 +static const u32 ar9580_1p0_type6_tx_gain_table[][5] = {
1861 + /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
1862 + {0x0000a2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
1863 + {0x0000a2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
1864 + {0x0000a2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
1865 + {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1866 + {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
1867 + {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1868 + {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
1869 + {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
1870 + {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
1871 + {0x0000a510, 0x15000028, 0x15000028, 0x0f000202, 0x0f000202},
1872 + {0x0000a514, 0x1b00002b, 0x1b00002b, 0x12000400, 0x12000400},
1873 + {0x0000a518, 0x1f020028, 0x1f020028, 0x16000402, 0x16000402},
1874 + {0x0000a51c, 0x2502002b, 0x2502002b, 0x19000404, 0x19000404},
1875 + {0x0000a520, 0x2a04002a, 0x2a04002a, 0x1c000603, 0x1c000603},
1876 + {0x0000a524, 0x2e06002a, 0x2e06002a, 0x21000a02, 0x21000a02},
1877 + {0x0000a528, 0x3302202d, 0x3302202d, 0x25000a04, 0x25000a04},
1878 + {0x0000a52c, 0x3804202c, 0x3804202c, 0x28000a20, 0x28000a20},
1879 + {0x0000a530, 0x3c06202c, 0x3c06202c, 0x2c000e20, 0x2c000e20},
1880 + {0x0000a534, 0x4108202d, 0x4108202d, 0x30000e22, 0x30000e22},
1881 + {0x0000a538, 0x4506402d, 0x4506402d, 0x34000e24, 0x34000e24},
1882 + {0x0000a53c, 0x4906222d, 0x4906222d, 0x38001640, 0x38001640},
1883 + {0x0000a540, 0x4d062231, 0x4d062231, 0x3c001660, 0x3c001660},
1884 + {0x0000a544, 0x50082231, 0x50082231, 0x3f001861, 0x3f001861},
1885 + {0x0000a548, 0x5608422e, 0x5608422e, 0x43001a81, 0x43001a81},
1886 + {0x0000a54c, 0x5e08442e, 0x5e08442e, 0x47001a83, 0x47001a83},
1887 + {0x0000a550, 0x620a4431, 0x620a4431, 0x4a001c84, 0x4a001c84},
1888 + {0x0000a554, 0x640a4432, 0x640a4432, 0x4e001ce3, 0x4e001ce3},
1889 + {0x0000a558, 0x680a4434, 0x680a4434, 0x52001ce5, 0x52001ce5},
1890 + {0x0000a55c, 0x6c0a6434, 0x6c0a6434, 0x56001ce9, 0x56001ce9},
1891 + {0x0000a560, 0x6f0a6633, 0x6f0a6633, 0x5a001ceb, 0x5a001ceb},
1892 + {0x0000a564, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1893 + {0x0000a568, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1894 + {0x0000a56c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1895 + {0x0000a570, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1896 + {0x0000a574, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1897 + {0x0000a578, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1898 + {0x0000a57c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1899 + {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1900 + {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1901 + {0x0000a608, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
1902 + {0x0000a60c, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
1903 + {0x0000a610, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
1904 + {0x0000a614, 0x01804601, 0x01804601, 0x01404000, 0x01404000},
1905 + {0x0000a618, 0x01804601, 0x01804601, 0x01404501, 0x01404501},
1906 + {0x0000a61c, 0x01804601, 0x01804601, 0x02008501, 0x02008501},
1907 + {0x0000a620, 0x03408d02, 0x03408d02, 0x0280ca03, 0x0280ca03},
1908 + {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
1909 + {0x0000a628, 0x03410d04, 0x03410d04, 0x04014c04, 0x04014c04},
1910 + {0x0000a62c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1911 + {0x0000a630, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1912 + {0x0000a634, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1913 + {0x0000a638, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1914 + {0x0000a63c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1915 + {0x0000b2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
1916 + {0x0000b2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
1917 + {0x0000b2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
1918 + {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1919 + {0x0000c2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
1920 + {0x0000c2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
1921 + {0x0000c2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
1922 + {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1923 + {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
1924 + {0x00016048, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
1925 + {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1926 + {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
1927 + {0x00016448, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
1928 + {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1929 + {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
1930 + {0x00016848, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
1931 + {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1934 static const u32 ar9580_1p0_soc_preamble[][2] = {
1936 {0x000040a4, 0x00a0c1c9},
1937 --- a/drivers/net/wireless/ath/ath9k/reg.h
1938 +++ b/drivers/net/wireless/ath/ath9k/reg.h
1940 #define AR_SREV_REVISION_9271_11 1
1941 #define AR_SREV_VERSION_9300 0x1c0
1942 #define AR_SREV_REVISION_9300_20 2 /* 2.0 and 2.1 */
1943 +#define AR_SREV_REVISION_9300_22 3
1944 #define AR_SREV_VERSION_9330 0x200
1945 #define AR_SREV_REVISION_9330_10 0
1946 #define AR_SREV_REVISION_9330_11 1
1948 (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9300))
1949 #define AR_SREV_9300_20_OR_LATER(_ah) \
1950 ((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9300)
1951 +#define AR_SREV_9300_22(_ah) \
1952 + (AR_SREV_9300(ah) && \
1953 + ((_ah)->hw_version.macRev == AR_SREV_REVISION_9300_22))
1955 #define AR_SREV_9330(_ah) \
1956 (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9330))