package/mac80211/patches/300-pending_work.patch

   1 --- a/net/mac80211/agg-rx.c
   2 +++ b/net/mac80211/agg-rx.c
   3 @@ -203,6 +203,8 @@ static void ieee80211_send_addba_resp(st
   4                 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
   5         else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
   6                 memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
   7 +       else if (sdata->vif.type == NL80211_IFTYPE_WDS)
   8 +               memcpy(mgmt->bssid, da, ETH_ALEN);
   9
  10         mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
  11                                           IEEE80211_STYPE_ACTION);
  12 --- a/net/mac80211/agg-tx.c
  13 +++ b/net/mac80211/agg-tx.c
  14 @@ -81,7 +81,8 @@ static void ieee80211_send_addba_request
  15         memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
  16         if (sdata->vif.type == NL80211_IFTYPE_AP ||
  17             sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
  18 -           sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
  19 +           sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
  20 +           sdata->vif.type == NL80211_IFTYPE_WDS)
  21                 memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
  22         else if (sdata->vif.type == NL80211_IFTYPE_STATION)
  23                 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
  24 @@ -520,6 +521,7 @@ int ieee80211_start_tx_ba_session(struct
  25             sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
  26             sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
  27             sdata->vif.type != NL80211_IFTYPE_AP &&
  28 +           sdata->vif.type != NL80211_IFTYPE_WDS &&
  29             sdata->vif.type != NL80211_IFTYPE_ADHOC)
  30                 return -EINVAL;
  31
  32 --- a/net/mac80211/debugfs_sta.c
  33 +++ b/net/mac80211/debugfs_sta.c
  34 @@ -65,11 +65,11 @@ static ssize_t sta_flags_read(struct fil
  35         test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
  36
  37         int res = scnprintf(buf, sizeof(buf),
  38 -                           "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
  39 +                           "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
  40                             TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
  41                             TEST(PS_DRIVER), TEST(AUTHORIZED),
  42                             TEST(SHORT_PREAMBLE),
  43 -                           TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
  44 +                           TEST(WME), TEST(CLEAR_PS_FILT),
  45                             TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
  46                             TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
  47                             TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
  48 --- a/net/mac80211/iface.c
  49 +++ b/net/mac80211/iface.c
  50 @@ -501,7 +501,6 @@ int ieee80211_do_open(struct wireless_de
  51         struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
  52         struct net_device *dev = wdev->netdev;
  53         struct ieee80211_local *local = sdata->local;
  54 -       struct sta_info *sta;
  55         u32 changed = 0;
  56         int res;
  57         u32 hw_reconf_flags = 0;
  58 @@ -658,30 +657,8 @@ int ieee80211_do_open(struct wireless_de
  59
  60         set_bit(SDATA_STATE_RUNNING, &sdata->state);
  61
  62 -       if (sdata->vif.type == NL80211_IFTYPE_WDS) {
  63 -               /* Create STA entry for the WDS peer */
  64 -               sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
  65 -                                    GFP_KERNEL);
  66 -               if (!sta) {
  67 -                       res = -ENOMEM;
  68 -                       goto err_del_interface;
  69 -               }
  70 -
  71 -               sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
  72 -               sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
  73 -               sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
  74 -
  75 -               res = sta_info_insert(sta);
  76 -               if (res) {
  77 -                       /* STA has been freed */
  78 -                       goto err_del_interface;
  79 -               }
  80 -
  81 -               rate_control_rate_init(sta);
  82 -               netif_carrier_on(dev);
  83 -       } else if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE) {
  84 +       if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE)
  85                 rcu_assign_pointer(local->p2p_sdata, sdata);
  86 -       }
  87
  88         /*
  89          * set_multicast_list will be invoked by the networking core
  90 @@ -1066,6 +1043,72 @@ static void ieee80211_if_setup(struct ne
  91         dev->destructor = free_netdev;
  92  }
  93
  94 +static void ieee80211_wds_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
  95 +                                        struct sk_buff *skb)
  96 +{
  97 +       struct ieee80211_local *local = sdata->local;
  98 +       struct ieee80211_rx_status *rx_status;
  99 +       struct ieee802_11_elems elems;
 100 +       struct ieee80211_mgmt *mgmt;
 101 +       struct sta_info *sta;
 102 +       size_t baselen;
 103 +       u32 rates = 0;
 104 +       u16 stype;
 105 +       bool new = false;
 106 +       enum ieee80211_band band = local->hw.conf.channel->band;
 107 +       struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
 108 +
 109 +       rx_status = IEEE80211_SKB_RXCB(skb);
 110 +       mgmt = (struct ieee80211_mgmt *) skb->data;
 111 +       stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
 112 +
 113 +       if (stype != IEEE80211_STYPE_BEACON)
 114 +               return;
 115 +
 116 +       baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
 117 +       if (baselen > skb->len)
 118 +               return;
 119 +
 120 +       ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
 121 +                              skb->len - baselen, &elems);
 122 +
 123 +       rates = ieee80211_sta_get_rates(local, &elems, band, NULL);
 124 +
 125 +       rcu_read_lock();
 126 +
 127 +       sta = sta_info_get(sdata, sdata->u.wds.remote_addr);
 128 +
 129 +       if (!sta) {
 130 +               rcu_read_unlock();
 131 +               sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
 132 +                                    GFP_KERNEL);
 133 +               if (!sta)
 134 +                       return;
 135 +
 136 +               new = true;
 137 +       }
 138 +
 139 +       sta->last_rx = jiffies;
 140 +       sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
 141 +
 142 +       if (elems.ht_cap_elem)
 143 +               ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
 144 +                               elems.ht_cap_elem, &sta->sta.ht_cap);
 145 +
 146 +       if (elems.wmm_param)
 147 +               set_sta_flag(sta, WLAN_STA_WME);
 148 +
 149 +       if (new) {
 150 +               sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
 151 +               sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
 152 +               sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
 153 +               rate_control_rate_init(sta);
 154 +               sta_info_insert_rcu(sta);
 155 +       }
 156 +
 157 +       rcu_read_unlock();
 158 +}
 159 +
 160  static void ieee80211_iface_work(struct work_struct *work)
 161  {
 162         struct ieee80211_sub_if_data *sdata =
 163 @@ -1170,6 +1213,9 @@ static void ieee80211_iface_work(struct
 164                                 break;
 165                         ieee80211_mesh_rx_queued_mgmt(sdata, skb);
 166                         break;
 167 +               case NL80211_IFTYPE_WDS:
 168 +                       ieee80211_wds_rx_queued_mgmt(sdata, skb);
 169 +                       break;
 170                 default:
 171                         WARN(1, "frame for unexpected interface type");
 172                         break;
 173 --- a/net/mac80211/rx.c
 174 +++ b/net/mac80211/rx.c
 175 @@ -2350,6 +2350,7 @@ ieee80211_rx_h_action(struct ieee80211_r
 176                     sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
 177                     sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
 178                     sdata->vif.type != NL80211_IFTYPE_AP &&
 179 +                   sdata->vif.type != NL80211_IFTYPE_WDS &&
 180                     sdata->vif.type != NL80211_IFTYPE_ADHOC)
 181                         break;
 182
 183 @@ -2655,14 +2656,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
 184
 185         if (!ieee80211_vif_is_mesh(&sdata->vif) &&
 186             sdata->vif.type != NL80211_IFTYPE_ADHOC &&
 187 -           sdata->vif.type != NL80211_IFTYPE_STATION)
 188 +           sdata->vif.type != NL80211_IFTYPE_STATION &&
 189 +           sdata->vif.type != NL80211_IFTYPE_WDS)
 190                 return RX_DROP_MONITOR;
 191
 192         switch (stype) {
 193         case cpu_to_le16(IEEE80211_STYPE_AUTH):
 194         case cpu_to_le16(IEEE80211_STYPE_BEACON):
 195         case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
 196 -               /* process for all: mesh, mlme, ibss */
 197 +               /* process for all: mesh, mlme, ibss, wds */
 198                 break;
 199         case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
 200         case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
 201 @@ -2987,10 +2989,16 @@ static int prepare_for_handlers(struct i
 202                 }
 203                 break;
 204         case NL80211_IFTYPE_WDS:
 205 -               if (bssid || !ieee80211_is_data(hdr->frame_control))
 206 -                       return 0;
 207                 if (!ether_addr_equal(sdata->u.wds.remote_addr, hdr->addr2))
 208                         return 0;
 209 +
 210 +               if (ieee80211_is_data(hdr->frame_control) ||
 211 +                   ieee80211_is_action(hdr->frame_control)) {
 212 +                       if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
 213 +                               return 0;
 214 +               } else if (!ieee80211_is_beacon(hdr->frame_control))
 215 +                       return 0;
 216 +
 217                 break;
 218         case NL80211_IFTYPE_P2P_DEVICE:
 219                 if (!ieee80211_is_public_action(hdr, skb->len) &&
 220 --- a/net/mac80211/sta_info.h
 221 +++ b/net/mac80211/sta_info.h
 222 @@ -32,7 +32,6 @@
 223   * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
 224   *     frames.
 225   * @WLAN_STA_WME: Station is a QoS-STA.
 226 - * @WLAN_STA_WDS: Station is one of our WDS peers.
 227   * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
 228   *     IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
 229   *     frame to this station is transmitted.
 230 @@ -64,7 +63,6 @@ enum ieee80211_sta_info_flags {
 231         WLAN_STA_AUTHORIZED,
 232         WLAN_STA_SHORT_PREAMBLE,
 233         WLAN_STA_WME,
 234 -       WLAN_STA_WDS,
 235         WLAN_STA_CLEAR_PS_FILT,
 236         WLAN_STA_MFP,
 237         WLAN_STA_BLOCK_BA,
 238 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 239 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
 240 @@ -324,7 +324,6 @@ struct ath_rx {
 241
 242  int ath_startrecv(struct ath_softc *sc);
 243  bool ath_stoprecv(struct ath_softc *sc);
 244 -void ath_flushrecv(struct ath_softc *sc);
 245  u32 ath_calcrxfilter(struct ath_softc *sc);
 246  int ath_rx_init(struct ath_softc *sc, int nbufs);
 247  void ath_rx_cleanup(struct ath_softc *sc);
 248 @@ -641,7 +640,6 @@ void ath_ant_comb_update(struct ath_soft
 249  enum sc_op_flags {
 250         SC_OP_INVALID,
 251         SC_OP_BEACONS,
 252 -       SC_OP_RXFLUSH,
 253         SC_OP_ANI_RUN,
 254         SC_OP_PRIM_STA_VIF,
 255         SC_OP_HW_RESET,
 256 --- a/drivers/net/wireless/ath/ath9k/beacon.c
 257 +++ b/drivers/net/wireless/ath/ath9k/beacon.c
 258 @@ -147,6 +147,7 @@ static struct ath_buf *ath9k_beacon_gene
 259                                  skb->len, DMA_TO_DEVICE);
 260                 dev_kfree_skb_any(skb);
 261                 bf->bf_buf_addr = 0;
 262 +               bf->bf_mpdu = NULL;
 263         }
 264
 265         skb = ieee80211_beacon_get(hw, vif);
 266 @@ -359,7 +360,6 @@ void ath9k_beacon_tasklet(unsigned long
 267                 return;
 268
 269         bf = ath9k_beacon_generate(sc->hw, vif);
 270 -       WARN_ON(!bf);
 271
 272         if (sc->beacon.bmisscnt != 0) {
 273                 ath_dbg(common, BSTUCK, "resume beacon xmit after %u misses\n",
 274 --- a/drivers/net/wireless/ath/ath9k/debug.c
 275 +++ b/drivers/net/wireless/ath/ath9k/debug.c
 276 @@ -861,7 +861,6 @@ static ssize_t read_file_recv(struct fil
 277         RXS_ERR("RX-LENGTH-ERR", rx_len_err);
 278         RXS_ERR("RX-OOM-ERR", rx_oom_err);
 279         RXS_ERR("RX-RATE-ERR", rx_rate_err);
 280 -       RXS_ERR("RX-DROP-RXFLUSH", rx_drop_rxflush);
 281         RXS_ERR("RX-TOO-MANY-FRAGS", rx_too_many_frags_err);
 282
 283         PHY_ERR("UNDERRUN ERR", ATH9K_PHYERR_UNDERRUN);
 284 --- a/drivers/net/wireless/ath/ath9k/debug.h
 285 +++ b/drivers/net/wireless/ath/ath9k/debug.h
 286 @@ -216,7 +216,6 @@ struct ath_tx_stats {
 287   * @rx_oom_err:  No. of frames dropped due to OOM issues.
 288   * @rx_rate_err:  No. of frames dropped due to rate errors.
 289   * @rx_too_many_frags_err:  Frames dropped due to too-many-frags received.
 290 - * @rx_drop_rxflush: No. of frames dropped due to RX-FLUSH.
 291   * @rx_beacons:  No. of beacons received.
 292   * @rx_frags:  No. of rx-fragements received.
 293   */
 294 @@ -235,7 +234,6 @@ struct ath_rx_stats {
 295         u32 rx_oom_err;
 296         u32 rx_rate_err;
 297         u32 rx_too_many_frags_err;
 298 -       u32 rx_drop_rxflush;
 299         u32 rx_beacons;
 300         u32 rx_frags;
 301  };
 302 --- a/drivers/net/wireless/ath/ath9k/main.c
 303 +++ b/drivers/net/wireless/ath/ath9k/main.c
 304 @@ -182,7 +182,7 @@ static void ath_restart_work(struct ath_
 305         ath_start_ani(sc);
 306  }
 307
 308 -static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
 309 +static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx)
 310  {
 311         struct ath_hw *ah = sc->sc_ah;
 312         bool ret = true;
 313 @@ -196,19 +196,15 @@ static bool ath_prepare_reset(struct ath
 314         ath9k_debug_samp_bb_mac(sc);
 315         ath9k_hw_disable_interrupts(ah);
 316
 317 +       tasklet_disable(&sc->intr_tq);
 318 +
 319         if (!ath_stoprecv(sc))
 320                 ret = false;
 321
 322         if (!ath_drain_all_txq(sc, retry_tx))
 323                 ret = false;
 324
 325 -       if (!flush) {
 326 -               if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
 327 -                       ath_rx_tasklet(sc, 1, true);
 328 -               ath_rx_tasklet(sc, 1, false);
 329 -       } else {
 330 -               ath_flushrecv(sc);
 331 -       }
 332 +       tasklet_enable(&sc->intr_tq);
 333
 334         return ret;
 335  }
 336 @@ -262,7 +258,6 @@ static int ath_reset_internal(struct ath
 337         struct ath_common *common = ath9k_hw_common(ah);
 338         struct ath9k_hw_cal_data *caldata = NULL;
 339         bool fastcc = true;
 340 -       bool flush = false;
 341         int r;
 342
 343         __ath_cancel_work(sc);
 344 @@ -276,11 +271,10 @@ static int ath_reset_internal(struct ath
 345
 346         if (!hchan) {
 347                 fastcc = false;
 348 -               flush = true;
 349                 hchan = ah->curchan;
 350         }
 351
 352 -       if (!ath_prepare_reset(sc, retry_tx, flush))
 353 +       if (!ath_prepare_reset(sc, retry_tx))
 354                 fastcc = false;
 355
 356         ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",
 357 @@ -804,7 +798,7 @@ static void ath9k_stop(struct ieee80211_
 358                 ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
 359         }
 360
 361 -       ath_prepare_reset(sc, false, true);
 362 +       ath_prepare_reset(sc, false);
 363
 364         if (sc->rx.frag) {
 365                 dev_kfree_skb_any(sc->rx.frag);
 366 --- a/drivers/net/wireless/ath/ath9k/recv.c
 367 +++ b/drivers/net/wireless/ath/ath9k/recv.c
 368 @@ -280,7 +280,6 @@ int ath_rx_init(struct ath_softc *sc, in
 369
 370         spin_lock_init(&sc->sc_pcu_lock);
 371         spin_lock_init(&sc->rx.rxbuflock);
 372 -       clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
 373
 374         common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 +
 375                              sc->sc_ah->caps.rx_status_len;
 376 @@ -464,6 +463,13 @@ start_recv:
 377         return 0;
 378  }
 379
 380 +static void ath_flushrecv(struct ath_softc *sc)
 381 +{
 382 +       if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
 383 +               ath_rx_tasklet(sc, 1, true);
 384 +       ath_rx_tasklet(sc, 1, false);
 385 +}
 386 +
 387  bool ath_stoprecv(struct ath_softc *sc)
 388  {
 389         struct ath_hw *ah = sc->sc_ah;
 390 @@ -474,6 +480,8 @@ bool ath_stoprecv(struct ath_softc *sc)
 391         ath9k_hw_setrxfilter(ah, 0);
 392         stopped = ath9k_hw_stopdmarecv(ah, &reset);
 393
 394 +       ath_flushrecv(sc);
 395 +
 396         if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
 397                 ath_edma_stop_recv(sc);
 398         else
 399 @@ -490,15 +498,6 @@ bool ath_stoprecv(struct ath_softc *sc)
 400         return stopped && !reset;
 401  }
 402
 403 -void ath_flushrecv(struct ath_softc *sc)
 404 -{
 405 -       set_bit(SC_OP_RXFLUSH, &sc->sc_flags);
 406 -       if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
 407 -               ath_rx_tasklet(sc, 1, true);
 408 -       ath_rx_tasklet(sc, 1, false);
 409 -       clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
 410 -}
 411 -
 412  static bool ath_beacon_dtim_pending_cab(struct sk_buff *skb)
 413  {
 414         /* Check whether the Beacon frame has DTIM indicating buffered bc/mc */
 415 @@ -735,6 +734,7 @@ static struct ath_buf *ath_get_next_rx_b
 416                         return NULL;
 417         }
 418
 419 +       list_del(&bf->list);
 420         if (!bf->bf_mpdu)
 421                 return bf;
 422
 423 @@ -1057,9 +1057,6 @@ int ath_rx_tasklet(struct ath_softc *sc,
 424
 425         do {
 426                 bool decrypt_error = false;
 427 -               /* If handling rx interrupt and flush is in progress => exit */
 428 -               if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags) && (flush == 0))
 429 -                       break;
 430
 431                 memset(&rs, 0, sizeof(rs));
 432                 if (edma)
 433 @@ -1102,15 +1099,6 @@ int ath_rx_tasklet(struct ath_softc *sc,
 434
 435                 ath_debug_stat_rx(sc, &rs);
 436
 437 -               /*
 438 -                * If we're asked to flush receive queue, directly
 439 -                * chain it back at the queue without processing it.
 440 -                */
 441 -               if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags)) {
 442 -                       RX_STAT_INC(rx_drop_rxflush);
 443 -                       goto requeue_drop_frag;
 444 -               }
 445 -
 446                 memset(rxs, 0, sizeof(struct ieee80211_rx_status));
 447
 448                 rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
 449 @@ -1245,14 +1233,15 @@ requeue_drop_frag:
 450                         sc->rx.frag = NULL;
 451                 }
 452  requeue:
 453 +               list_add_tail(&bf->list, &sc->rx.rxbuf);
 454 +               if (flush)
 455 +                       continue;
 456 +
 457                 if (edma) {
 458 -                       list_add_tail(&bf->list, &sc->rx.rxbuf);
 459                         ath_rx_edma_buf_link(sc, qtype);
 460                 } else {
 461 -                       list_move_tail(&bf->list, &sc->rx.rxbuf);
 462                         ath_rx_buf_link(sc, bf);
 463 -                       if (!flush)
 464 -                               ath9k_hw_rxena(ah);
 465 +                       ath9k_hw_rxena(ah);
 466                 }
 467         } while (1);
 468
 469 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
 470 +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
 471 @@ -4586,14 +4586,14 @@ static int ar9003_hw_cal_pier_get(struct
 472         return 0;
 473  }
 474
 475 -static int ar9003_hw_power_control_override(struct ath_hw *ah,
 476 -                                           int frequency,
 477 -                                           int *correction,
 478 -                                           int *voltage, int *temperature)
 479 +static void ar9003_hw_power_control_override(struct ath_hw *ah,
 480 +                                            int frequency,
 481 +                                            int *correction,
 482 +                                            int *voltage, int *temperature)
 483  {
 484 -       int tempSlope = 0;
 485 +       int temp_slope = 0, temp_slope1 = 0, temp_slope2 = 0;
 486         struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
 487 -       int f[8], t[8], i;
 488 +       int f[8], t[8], t1[3], t2[3], i;
 489
 490         REG_RMW(ah, AR_PHY_TPC_11_B0,
 491                 (correction[0] << AR_PHY_TPC_OLPC_GAIN_DELTA_S),
 492 @@ -4624,38 +4624,108 @@ static int ar9003_hw_power_control_overr
 493          * enable temperature compensation
 494          * Need to use register names
 495          */
 496 -       if (frequency < 4000)
 497 -               tempSlope = eep->modalHeader2G.tempSlope;
 498 -       else if ((eep->baseEepHeader.miscConfiguration & 0x20) != 0) {
 499 -               for (i = 0; i < 8; i++) {
 500 -                       t[i] = eep->base_ext1.tempslopextension[i];
 501 -                       f[i] = FBIN2FREQ(eep->calFreqPier5G[i], 0);
 502 -               }
 503 -               tempSlope = ar9003_hw_power_interpolate((s32) frequency,
 504 -                                                       f, t, 8);
 505 -       } else if (eep->base_ext2.tempSlopeLow != 0) {
 506 -               t[0] = eep->base_ext2.tempSlopeLow;
 507 -               f[0] = 5180;
 508 -               t[1] = eep->modalHeader5G.tempSlope;
 509 -               f[1] = 5500;
 510 -               t[2] = eep->base_ext2.tempSlopeHigh;
 511 -               f[2] = 5785;
 512 -               tempSlope = ar9003_hw_power_interpolate((s32) frequency,
 513 -                                                       f, t, 3);
 514 -       } else
 515 -               tempSlope = eep->modalHeader5G.tempSlope;
 516 +       if (frequency < 4000) {
 517 +               temp_slope = eep->modalHeader2G.tempSlope;
 518 +       } else {
 519 +               if (AR_SREV_9550(ah)) {
 520 +                       t[0] = eep->base_ext1.tempslopextension[2];
 521 +                       t1[0] = eep->base_ext1.tempslopextension[3];
 522 +                       t2[0] = eep->base_ext1.tempslopextension[4];
 523 +                       f[0] = 5180;
 524 +
 525 +                       t[1] = eep->modalHeader5G.tempSlope;
 526 +                       t1[1] = eep->base_ext1.tempslopextension[0];
 527 +                       t2[1] = eep->base_ext1.tempslopextension[1];
 528 +                       f[1] = 5500;
 529 +
 530 +                       t[2] = eep->base_ext1.tempslopextension[5];
 531 +                       t1[2] = eep->base_ext1.tempslopextension[6];
 532 +                       t2[2] = eep->base_ext1.tempslopextension[7];
 533 +                       f[2] = 5785;
 534 +
 535 +                       temp_slope = ar9003_hw_power_interpolate(frequency,
 536 +                                                                f, t, 3);
 537 +                       temp_slope1 = ar9003_hw_power_interpolate(frequency,
 538 +                                                                  f, t1, 3);
 539 +                       temp_slope2 = ar9003_hw_power_interpolate(frequency,
 540 +                                                                  f, t2, 3);
 541 +
 542 +                       goto tempslope;
 543 +               }
 544 +
 545 +               if ((eep->baseEepHeader.miscConfiguration & 0x20) != 0) {
 546 +                       for (i = 0; i < 8; i++) {
 547 +                               t[i] = eep->base_ext1.tempslopextension[i];
 548 +                               f[i] = FBIN2FREQ(eep->calFreqPier5G[i], 0);
 549 +                       }
 550 +                       temp_slope = ar9003_hw_power_interpolate((s32) frequency,
 551 +                                                                f, t, 8);
 552 +               } else if (eep->base_ext2.tempSlopeLow != 0) {
 553 +                       t[0] = eep->base_ext2.tempSlopeLow;
 554 +                       f[0] = 5180;
 555 +                       t[1] = eep->modalHeader5G.tempSlope;
 556 +                       f[1] = 5500;
 557 +                       t[2] = eep->base_ext2.tempSlopeHigh;
 558 +                       f[2] = 5785;
 559 +                       temp_slope = ar9003_hw_power_interpolate((s32) frequency,
 560 +                                                                f, t, 3);
 561 +               } else {
 562 +                       temp_slope = eep->modalHeader5G.tempSlope;
 563 +               }
 564 +       }
 565
 566 -       REG_RMW_FIELD(ah, AR_PHY_TPC_19, AR_PHY_TPC_19_ALPHA_THERM, tempSlope);
 567 +tempslope:
 568 +       if (AR_SREV_9550(ah)) {
 569 +               /*
 570 +                * AR955x has tempSlope register for each chain.
 571 +                * Check whether temp_compensation feature is enabled or not.
 572 +                */
 573 +               if (eep->baseEepHeader.featureEnable & 0x1) {
 574 +                       if (frequency < 4000) {
 575 +                               REG_RMW_FIELD(ah, AR_PHY_TPC_19,
 576 +                                             AR_PHY_TPC_19_ALPHA_THERM,
 577 +                                             eep->base_ext2.tempSlopeLow);
 578 +                               REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
 579 +                                             AR_PHY_TPC_19_ALPHA_THERM,
 580 +                                             temp_slope);
 581 +                               REG_RMW_FIELD(ah, AR_PHY_TPC_19_B2,
 582 +                                             AR_PHY_TPC_19_ALPHA_THERM,
 583 +                                             eep->base_ext2.tempSlopeHigh);
 584 +                       } else {
 585 +                               REG_RMW_FIELD(ah, AR_PHY_TPC_19,
 586 +                                             AR_PHY_TPC_19_ALPHA_THERM,
 587 +                                             temp_slope);
 588 +                               REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
 589 +                                             AR_PHY_TPC_19_ALPHA_THERM,
 590 +                                             temp_slope1);
 591 +                               REG_RMW_FIELD(ah, AR_PHY_TPC_19_B2,
 592 +                                             AR_PHY_TPC_19_ALPHA_THERM,
 593 +                                             temp_slope2);
 594 +                       }
 595 +               } else {
 596 +                       /*
 597 +                        * If temp compensation is not enabled,
 598 +                        * set all registers to 0.
 599 +                        */
 600 +                       REG_RMW_FIELD(ah, AR_PHY_TPC_19,
 601 +                                     AR_PHY_TPC_19_ALPHA_THERM, 0);
 602 +                       REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
 603 +                                     AR_PHY_TPC_19_ALPHA_THERM, 0);
 604 +                       REG_RMW_FIELD(ah, AR_PHY_TPC_19_B2,
 605 +                                     AR_PHY_TPC_19_ALPHA_THERM, 0);
 606 +               }
 607 +       } else {
 608 +               REG_RMW_FIELD(ah, AR_PHY_TPC_19,
 609 +                             AR_PHY_TPC_19_ALPHA_THERM, temp_slope);
 610 +       }
 611
 612         if (AR_SREV_9462_20(ah))
 613                 REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
 614 -                             AR_PHY_TPC_19_B1_ALPHA_THERM, tempSlope);
 615 +                             AR_PHY_TPC_19_B1_ALPHA_THERM, temp_slope);
 616
 617
 618         REG_RMW_FIELD(ah, AR_PHY_TPC_18, AR_PHY_TPC_18_THERM_CAL_VALUE,
 619                       temperature[0]);
 620 -
 621 -       return 0;
 622  }
 623
 624  /* Apply the recorded correction values. */
 625 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
 626 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
 627 @@ -68,7 +68,7 @@ static const int m2ThreshExt_off = 127;
 628  static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
 629  {
 630         u16 bMode, fracMode = 0, aModeRefSel = 0;
 631 -       u32 freq, channelSel = 0, reg32 = 0;
 632 +       u32 freq, chan_frac, div, channelSel = 0, reg32 = 0;
 633         struct chan_centers centers;
 634         int loadSynthChannel;
 635
 636 @@ -77,9 +77,6 @@ static int ar9003_hw_set_channel(struct
 637
 638         if (freq < 4800) {     /* 2 GHz, fractional mode */
 639                 if (AR_SREV_9330(ah)) {
 640 -                       u32 chan_frac;
 641 -                       u32 div;
 642 -
 643                         if (ah->is_clk_25mhz)
 644                                 div = 75;
 645                         else
 646 @@ -89,34 +86,40 @@ static int ar9003_hw_set_channel(struct
 647                         chan_frac = (((freq * 4) % div) * 0x20000) / div;
 648                         channelSel = (channelSel << 17) | chan_frac;
 649                 } else if (AR_SREV_9485(ah) || AR_SREV_9565(ah)) {
 650 -                       u32 chan_frac;
 651 -
 652                         /*
 653 -                        * freq_ref = 40 / (refdiva >> amoderefsel); where refdiva=1 and amoderefsel=0
 654 +                        * freq_ref = 40 / (refdiva >> amoderefsel);
 655 +                        * where refdiva=1 and amoderefsel=0
 656                          * ndiv = ((chan_mhz * 4) / 3) / freq_ref;
 657                          * chansel = int(ndiv), chanfrac = (ndiv - chansel) * 0x20000
 658                          */
 659                         channelSel = (freq * 4) / 120;
 660                         chan_frac = (((freq * 4) % 120) * 0x20000) / 120;
 661                         channelSel = (channelSel << 17) | chan_frac;
 662 -               } else if (AR_SREV_9340(ah) || AR_SREV_9550(ah)) {
 663 +               } else if (AR_SREV_9340(ah)) {
 664                         if (ah->is_clk_25mhz) {
 665 -                               u32 chan_frac;
 666 -
 667                                 channelSel = (freq * 2) / 75;
 668                                 chan_frac = (((freq * 2) % 75) * 0x20000) / 75;
 669                                 channelSel = (channelSel << 17) | chan_frac;
 670 -                       } else
 671 +                       } else {
 672                                 channelSel = CHANSEL_2G(freq) >> 1;
 673 -               } else
 674 +                       }
 675 +               } else if (AR_SREV_9550(ah)) {
 676 +                       if (ah->is_clk_25mhz)
 677 +                               div = 75;
 678 +                       else
 679 +                               div = 120;
 680 +
 681 +                       channelSel = (freq * 4) / div;
 682 +                       chan_frac = (((freq * 4) % div) * 0x20000) / div;
 683 +                       channelSel = (channelSel << 17) | chan_frac;
 684 +               } else {
 685                         channelSel = CHANSEL_2G(freq);
 686 +               }
 687                 /* Set to 2G mode */
 688                 bMode = 1;
 689         } else {
 690                 if ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) &&
 691                     ah->is_clk_25mhz) {
 692 -                       u32 chan_frac;
 693 -
 694                         channelSel = freq / 75;
 695                         chan_frac = ((freq % 75) * 0x20000) / 75;
 696                         channelSel = (channelSel << 17) | chan_frac;
 697 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
 698 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
 699 @@ -1028,7 +1028,7 @@
 700  #define AR_PHY_TPC_5_B2          (AR_SM2_BASE + 0x208)
 701  #define AR_PHY_TPC_6_B2          (AR_SM2_BASE + 0x20c)
 702  #define AR_PHY_TPC_11_B2         (AR_SM2_BASE + 0x220)
 703 -#define AR_PHY_PDADC_TAB_2       (AR_SM2_BASE + 0x240)
 704 +#define AR_PHY_TPC_19_B2         (AR_SM2_BASE + 0x240)
 705  #define AR_PHY_TX_IQCAL_STATUS_B2   (AR_SM2_BASE + 0x48c)
 706  #define AR_PHY_TX_IQCAL_CORR_COEFF_B2(_i)    (AR_SM2_BASE + 0x450 + ((_i) << 2))
 707
 708 --- a/drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h
 709 +++ b/drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h
 710 @@ -23,16 +23,16 @@
 711  static const u32 ar955x_1p0_radio_postamble[][5] = {
 712         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
 713         {0x00016098, 0xd2dd5554, 0xd2dd5554, 0xd28b3330, 0xd28b3330},
 714 -       {0x0001609c, 0x0a566f3a, 0x0a566f3a, 0x06345f2a, 0x06345f2a},
 715 -       {0x000160ac, 0xa4647c00, 0xa4647c00, 0xa4646800, 0xa4646800},
 716 -       {0x000160b0, 0x01885f52, 0x01885f52, 0x04accf3a, 0x04accf3a},
 717 -       {0x00016104, 0xb7a00001, 0xb7a00001, 0xb7a00001, 0xb7a00001},
 718 +       {0x0001609c, 0x0a566f3a, 0x0a566f3a, 0x0a566f3a, 0x0a566f3a},
 719 +       {0x000160ac, 0xa4647c00, 0xa4647c00, 0x24647c00, 0x24647c00},
 720 +       {0x000160b0, 0x01885f52, 0x01885f52, 0x01885f52, 0x01885f52},
 721 +       {0x00016104, 0xb7a00000, 0xb7a00000, 0xb7a00001, 0xb7a00001},
 722         {0x0001610c, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000},
 723         {0x00016140, 0x10804008, 0x10804008, 0x10804008, 0x10804008},
 724 -       {0x00016504, 0xb7a00001, 0xb7a00001, 0xb7a00001, 0xb7a00001},
 725 +       {0x00016504, 0xb7a00000, 0xb7a00000, 0xb7a00001, 0xb7a00001},
 726         {0x0001650c, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000},
 727         {0x00016540, 0x10804008, 0x10804008, 0x10804008, 0x10804008},
 728 -       {0x00016904, 0xb7a00001, 0xb7a00001, 0xb7a00001, 0xb7a00001},
 729 +       {0x00016904, 0xb7a00000, 0xb7a00000, 0xb7a00001, 0xb7a00001},
 730         {0x0001690c, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000},
 731         {0x00016940, 0x10804008, 0x10804008, 0x10804008, 0x10804008},
 732  };
 733 @@ -69,15 +69,15 @@ static const u32 ar955x_1p0_baseband_pos
 734         {0x0000a204, 0x005c0ec0, 0x005c0ec4, 0x005c0ec4, 0x005c0ec0},
 735         {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
 736         {0x0000a22c, 0x07e26a2f, 0x07e26a2f, 0x01026a2f, 0x01026a2f},
 737 -       {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
 738 +       {0x0000a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
 739         {0x0000a234, 0x00000fff, 0x10000fff, 0x10000fff, 0x00000fff},
 740         {0x0000a238, 0xffb01018, 0xffb01018, 0xffb01018, 0xffb01018},
 741         {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
 742         {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
 743         {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
 744 -       {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
 745 +       {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01010e0e, 0x01010e0e},
 746         {0x0000a260, 0x0a021501, 0x0a021501, 0x3a021501, 0x3a021501},
 747 -       {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
 748 +       {0x0000a264, 0x00000e0e, 0x00000e0e, 0x01000e0e, 0x01000e0e},
 749         {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
 750         {0x0000a284, 0x00000000, 0x00000000, 0x00000010, 0x00000010},
 751         {0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
 752 @@ -125,7 +125,7 @@ static const u32 ar955x_1p0_radio_core[]
 753         {0x00016094, 0x00000000},
 754         {0x000160a0, 0x0a108ffe},
 755         {0x000160a4, 0x812fc370},
 756 -       {0x000160a8, 0x423c8000},
 757 +       {0x000160a8, 0x423c8100},
 758         {0x000160b4, 0x92480080},
 759         {0x000160c0, 0x006db6d0},
 760         {0x000160c4, 0x6db6db60},
 761 @@ -134,7 +134,7 @@ static const u32 ar955x_1p0_radio_core[]
 762         {0x00016100, 0x11999601},
 763         {0x00016108, 0x00080010},
 764         {0x00016144, 0x02084080},
 765 -       {0x00016148, 0x000080c0},
 766 +       {0x00016148, 0x00008040},
 767         {0x00016280, 0x01800804},
 768         {0x00016284, 0x00038dc5},
 769         {0x00016288, 0x00000000},
 770 @@ -178,7 +178,7 @@ static const u32 ar955x_1p0_radio_core[]
 771         {0x00016500, 0x11999601},
 772         {0x00016508, 0x00080010},
 773         {0x00016544, 0x02084080},
 774 -       {0x00016548, 0x000080c0},
 775 +       {0x00016548, 0x00008040},
 776         {0x00016780, 0x00000000},
 777         {0x00016784, 0x00000000},
 778         {0x00016788, 0x00400705},
 779 @@ -218,7 +218,7 @@ static const u32 ar955x_1p0_radio_core[]
 780         {0x00016900, 0x11999601},
 781         {0x00016908, 0x00080010},
 782         {0x00016944, 0x02084080},
 783 -       {0x00016948, 0x000080c0},
 784 +       {0x00016948, 0x00008040},
 785         {0x00016b80, 0x00000000},
 786         {0x00016b84, 0x00000000},
 787         {0x00016b88, 0x00400705},
 788 @@ -245,9 +245,9 @@ static const u32 ar955x_1p0_radio_core[]
 789
 790  static const u32 ar955x_1p0_modes_xpa_tx_gain_table[][9] = {
 791         /* Addr      5G_HT20_L   5G_HT40_L   5G_HT20_M   5G_HT40_M   5G_HT20_H   5G_HT40_H   2G_HT40     2G_HT20  */
 792 -       {0x0000a2dc, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xfffd5aaa, 0xfffd5aaa},
 793 -       {0x0000a2e0, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xfffe9ccc, 0xfffe9ccc},
 794 -       {0x0000a2e4, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xffffe0f0, 0xffffe0f0},
 795 +       {0x0000a2dc, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xfffd5aaa, 0xfffd5aaa},
 796 +       {0x0000a2e0, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffe9ccc, 0xfffe9ccc},
 797 +       {0x0000a2e4, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffffe0f0, 0xffffe0f0},
 798         {0x0000a2e8, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xfffcff00, 0xfffcff00},
 799         {0x0000a410, 0x000050de, 0x000050de, 0x000050de, 0x000050de, 0x000050de, 0x000050de, 0x000050da, 0x000050da},
 800         {0x0000a500, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000000, 0x00000000},
 801 @@ -256,63 +256,63 @@ static const u32 ar955x_1p0_modes_xpa_tx
 802         {0x0000a50c, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c000006, 0x0c000006},
 803         {0x0000a510, 0x1000000d, 0x1000000d, 0x1000000d, 0x1000000d, 0x1000000d, 0x1000000d, 0x0f00000a, 0x0f00000a},
 804         {0x0000a514, 0x14000011, 0x14000011, 0x14000011, 0x14000011, 0x14000011, 0x14000011, 0x1300000c, 0x1300000c},
 805 -       {0x0000a518, 0x19004008, 0x19004008, 0x19004008, 0x19004008, 0x18004008, 0x18004008, 0x1700000e, 0x1700000e},
 806 -       {0x0000a51c, 0x1d00400a, 0x1d00400a, 0x1d00400a, 0x1d00400a, 0x1c00400a, 0x1c00400a, 0x1b000064, 0x1b000064},
 807 -       {0x0000a520, 0x230020a2, 0x230020a2, 0x210020a2, 0x210020a2, 0x200020a2, 0x200020a2, 0x1f000242, 0x1f000242},
 808 -       {0x0000a524, 0x2500006e, 0x2500006e, 0x2500006e, 0x2500006e, 0x2400006e, 0x2400006e, 0x23000229, 0x23000229},
 809 -       {0x0000a528, 0x29022221, 0x29022221, 0x28022221, 0x28022221, 0x27022221, 0x27022221, 0x270002a2, 0x270002a2},
 810 -       {0x0000a52c, 0x2d00062a, 0x2d00062a, 0x2c00062a, 0x2c00062a, 0x2a00062a, 0x2a00062a, 0x2c001203, 0x2c001203},
 811 -       {0x0000a530, 0x340220a5, 0x340220a5, 0x320220a5, 0x320220a5, 0x2f0220a5, 0x2f0220a5, 0x30001803, 0x30001803},
 812 -       {0x0000a534, 0x380022c5, 0x380022c5, 0x350022c5, 0x350022c5, 0x320022c5, 0x320022c5, 0x33000881, 0x33000881},
 813 -       {0x0000a538, 0x3b002486, 0x3b002486, 0x39002486, 0x39002486, 0x36002486, 0x36002486, 0x38001809, 0x38001809},
 814 -       {0x0000a53c, 0x3f00248a, 0x3f00248a, 0x3d00248a, 0x3d00248a, 0x3a00248a, 0x3a00248a, 0x3a000814, 0x3a000814},
 815 -       {0x0000a540, 0x4202242c, 0x4202242c, 0x4102242c, 0x4102242c, 0x3f02242c, 0x3f02242c, 0x3f001a0c, 0x3f001a0c},
 816 -       {0x0000a544, 0x490044c6, 0x490044c6, 0x460044c6, 0x460044c6, 0x420044c6, 0x420044c6, 0x43001a0e, 0x43001a0e},
 817 -       {0x0000a548, 0x4d024485, 0x4d024485, 0x4a024485, 0x4a024485, 0x46024485, 0x46024485, 0x46001812, 0x46001812},
 818 -       {0x0000a54c, 0x51044483, 0x51044483, 0x4e044483, 0x4e044483, 0x4a044483, 0x4a044483, 0x49001884, 0x49001884},
 819 -       {0x0000a550, 0x5404a40c, 0x5404a40c, 0x5204a40c, 0x5204a40c, 0x4d04a40c, 0x4d04a40c, 0x4d001e84, 0x4d001e84},
 820 -       {0x0000a554, 0x57024632, 0x57024632, 0x55024632, 0x55024632, 0x52024632, 0x52024632, 0x50001e69, 0x50001e69},
 821 -       {0x0000a558, 0x5c00a634, 0x5c00a634, 0x5900a634, 0x5900a634, 0x5600a634, 0x5600a634, 0x550006f4, 0x550006f4},
 822 -       {0x0000a55c, 0x5f026832, 0x5f026832, 0x5d026832, 0x5d026832, 0x5a026832, 0x5a026832, 0x59000ad3, 0x59000ad3},
 823 -       {0x0000a560, 0x6602b012, 0x6602b012, 0x6202b012, 0x6202b012, 0x5d02b012, 0x5d02b012, 0x5e000ad5, 0x5e000ad5},
 824 -       {0x0000a564, 0x6e02d0e1, 0x6e02d0e1, 0x6802d0e1, 0x6802d0e1, 0x6002d0e1, 0x6002d0e1, 0x61001ced, 0x61001ced},
 825 -       {0x0000a568, 0x7202b4c4, 0x7202b4c4, 0x6c02b4c4, 0x6c02b4c4, 0x6502b4c4, 0x6502b4c4, 0x660018d4, 0x660018d4},
 826 -       {0x0000a56c, 0x75007894, 0x75007894, 0x70007894, 0x70007894, 0x6b007894, 0x6b007894, 0x660018d4, 0x660018d4},
 827 -       {0x0000a570, 0x7b025c74, 0x7b025c74, 0x75025c74, 0x75025c74, 0x70025c74, 0x70025c74, 0x660018d4, 0x660018d4},
 828 -       {0x0000a574, 0x8300bcb5, 0x8300bcb5, 0x7a00bcb5, 0x7a00bcb5, 0x7600bcb5, 0x7600bcb5, 0x660018d4, 0x660018d4},
 829 -       {0x0000a578, 0x8a04dc74, 0x8a04dc74, 0x7f04dc74, 0x7f04dc74, 0x7c04dc74, 0x7c04dc74, 0x660018d4, 0x660018d4},
 830 -       {0x0000a57c, 0x8a04dc74, 0x8a04dc74, 0x7f04dc74, 0x7f04dc74, 0x7c04dc74, 0x7c04dc74, 0x660018d4, 0x660018d4},
 831 +       {0x0000a518, 0x1700002b, 0x1700002b, 0x1700002b, 0x1700002b, 0x1600002b, 0x1600002b, 0x1700000e, 0x1700000e},
 832 +       {0x0000a51c, 0x1b00002d, 0x1b00002d, 0x1b00002d, 0x1b00002d, 0x1a00002d, 0x1a00002d, 0x1b000064, 0x1b000064},
 833 +       {0x0000a520, 0x20000031, 0x20000031, 0x1f000031, 0x1f000031, 0x1e000031, 0x1e000031, 0x1f000242, 0x1f000242},
 834 +       {0x0000a524, 0x24000051, 0x24000051, 0x23000051, 0x23000051, 0x23000051, 0x23000051, 0x23000229, 0x23000229},
 835 +       {0x0000a528, 0x27000071, 0x27000071, 0x27000071, 0x27000071, 0x26000071, 0x26000071, 0x270002a2, 0x270002a2},
 836 +       {0x0000a52c, 0x2b000092, 0x2b000092, 0x2b000092, 0x2b000092, 0x2b000092, 0x2b000092, 0x2c001203, 0x2c001203},
 837 +       {0x0000a530, 0x3000028c, 0x3000028c, 0x2f00028c, 0x2f00028c, 0x2e00028c, 0x2e00028c, 0x30001803, 0x30001803},
 838 +       {0x0000a534, 0x34000290, 0x34000290, 0x33000290, 0x33000290, 0x32000290, 0x32000290, 0x33000881, 0x33000881},
 839 +       {0x0000a538, 0x37000292, 0x37000292, 0x36000292, 0x36000292, 0x35000292, 0x35000292, 0x38001809, 0x38001809},
 840 +       {0x0000a53c, 0x3b02028d, 0x3b02028d, 0x3a02028d, 0x3a02028d, 0x3902028d, 0x3902028d, 0x3a000814, 0x3a000814},
 841 +       {0x0000a540, 0x3f020291, 0x3f020291, 0x3e020291, 0x3e020291, 0x3d020291, 0x3d020291, 0x3f001a0c, 0x3f001a0c},
 842 +       {0x0000a544, 0x44020490, 0x44020490, 0x43020490, 0x43020490, 0x42020490, 0x42020490, 0x43001a0e, 0x43001a0e},
 843 +       {0x0000a548, 0x48020492, 0x48020492, 0x47020492, 0x47020492, 0x46020492, 0x46020492, 0x46001812, 0x46001812},
 844 +       {0x0000a54c, 0x4c020692, 0x4c020692, 0x4b020692, 0x4b020692, 0x4a020692, 0x4a020692, 0x49001884, 0x49001884},
 845 +       {0x0000a550, 0x50020892, 0x50020892, 0x4f020892, 0x4f020892, 0x4e020892, 0x4e020892, 0x4d001e84, 0x4d001e84},
 846 +       {0x0000a554, 0x53040891, 0x53040891, 0x53040891, 0x53040891, 0x52040891, 0x52040891, 0x50001e69, 0x50001e69},
 847 +       {0x0000a558, 0x58040893, 0x58040893, 0x57040893, 0x57040893, 0x56040893, 0x56040893, 0x550006f4, 0x550006f4},
 848 +       {0x0000a55c, 0x5c0408b4, 0x5c0408b4, 0x5a0408b4, 0x5a0408b4, 0x5a0408b4, 0x5a0408b4, 0x59000ad3, 0x59000ad3},
 849 +       {0x0000a560, 0x610408b6, 0x610408b6, 0x5e0408b6, 0x5e0408b6, 0x5e0408b6, 0x5e0408b6, 0x5e000ad5, 0x5e000ad5},
 850 +       {0x0000a564, 0x670408f6, 0x670408f6, 0x620408f6, 0x620408f6, 0x620408f6, 0x620408f6, 0x61001ced, 0x61001ced},
 851 +       {0x0000a568, 0x6a040cf6, 0x6a040cf6, 0x66040cf6, 0x66040cf6, 0x66040cf6, 0x66040cf6, 0x660018d4, 0x660018d4},
 852 +       {0x0000a56c, 0x6d040d76, 0x6d040d76, 0x6a040d76, 0x6a040d76, 0x6a040d76, 0x6a040d76, 0x660018d4, 0x660018d4},
 853 +       {0x0000a570, 0x70060db6, 0x70060db6, 0x6e060db6, 0x6e060db6, 0x6e060db6, 0x6e060db6, 0x660018d4, 0x660018d4},
 854 +       {0x0000a574, 0x730a0df6, 0x730a0df6, 0x720a0df6, 0x720a0df6, 0x720a0df6, 0x720a0df6, 0x660018d4, 0x660018d4},
 855 +       {0x0000a578, 0x770a13f6, 0x770a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x660018d4, 0x660018d4},
 856 +       {0x0000a57c, 0x770a13f6, 0x770a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x660018d4, 0x660018d4},
 857         {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 858         {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 859         {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 860 -       {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03804000, 0x03804000},
 861 -       {0x0000a610, 0x04c08c01, 0x04c08c01, 0x04808b01, 0x04808b01, 0x04808a01, 0x04808a01, 0x0300ca02, 0x0300ca02},
 862 -       {0x0000a614, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00000e04, 0x00000e04},
 863 -       {0x0000a618, 0x04010c01, 0x04010c01, 0x03c10b01, 0x03c10b01, 0x03810a01, 0x03810a01, 0x03014000, 0x03014000},
 864 -       {0x0000a61c, 0x03814e05, 0x03814e05, 0x03414d05, 0x03414d05, 0x03414d05, 0x03414d05, 0x00000000, 0x00000000},
 865 -       {0x0000a620, 0x04010303, 0x04010303, 0x03c10303, 0x03c10303, 0x03810303, 0x03810303, 0x00000000, 0x00000000},
 866 -       {0x0000a624, 0x03814e05, 0x03814e05, 0x03414d05, 0x03414d05, 0x03414d05, 0x03414d05, 0x03014000, 0x03014000},
 867 -       {0x0000a628, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x03804c05, 0x03804c05},
 868 -       {0x0000a62c, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x0701de06, 0x0701de06},
 869 -       {0x0000a630, 0x03418000, 0x03418000, 0x03018000, 0x03018000, 0x02c18000, 0x02c18000, 0x07819c07, 0x07819c07},
 870 -       {0x0000a634, 0x03815004, 0x03815004, 0x03414f04, 0x03414f04, 0x03414e04, 0x03414e04, 0x0701dc07, 0x0701dc07},
 871 -       {0x0000a638, 0x03005302, 0x03005302, 0x02c05202, 0x02c05202, 0x02805202, 0x02805202, 0x0701dc07, 0x0701dc07},
 872 -       {0x0000a63c, 0x04c09302, 0x04c09302, 0x04809202, 0x04809202, 0x04809202, 0x04809202, 0x0701dc07, 0x0701dc07},
 873 -       {0x0000b2dc, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xfffd5aaa, 0xfffd5aaa},
 874 -       {0x0000b2e0, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xfffe9ccc, 0xfffe9ccc},
 875 -       {0x0000b2e4, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xffffe0f0, 0xffffe0f0},
 876 +       {0x0000a60c, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x03804000, 0x03804000},
 877 +       {0x0000a610, 0x04008b01, 0x04008b01, 0x04008b01, 0x04008b01, 0x03c08b01, 0x03c08b01, 0x0300ca02, 0x0300ca02},
 878 +       {0x0000a614, 0x05811403, 0x05811403, 0x05411303, 0x05411303, 0x05411303, 0x05411303, 0x00000e04, 0x00000e04},
 879 +       {0x0000a618, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x03014000, 0x03014000},
 880 +       {0x0000a61c, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x00000000, 0x00000000},
 881 +       {0x0000a620, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x00000000, 0x00000000},
 882 +       {0x0000a624, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x03014000, 0x03014000},
 883 +       {0x0000a628, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x03804c05, 0x03804c05},
 884 +       {0x0000a62c, 0x06815604, 0x06815604, 0x06415504, 0x06415504, 0x06015504, 0x06015504, 0x0701de06, 0x0701de06},
 885 +       {0x0000a630, 0x07819a05, 0x07819a05, 0x07419905, 0x07419905, 0x07019805, 0x07019805, 0x07819c07, 0x07819c07},
 886 +       {0x0000a634, 0x07819e06, 0x07819e06, 0x07419d06, 0x07419d06, 0x07019c06, 0x07019c06, 0x0701dc07, 0x0701dc07},
 887 +       {0x0000a638, 0x07819e06, 0x07819e06, 0x07419d06, 0x07419d06, 0x07019c06, 0x07019c06, 0x0701dc07, 0x0701dc07},
 888 +       {0x0000a63c, 0x07819e06, 0x07819e06, 0x07419d06, 0x07419d06, 0x07019c06, 0x07019c06, 0x0701dc07, 0x0701dc07},
 889 +       {0x0000b2dc, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xfffd5aaa, 0xfffd5aaa},
 890 +       {0x0000b2e0, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffe9ccc, 0xfffe9ccc},
 891 +       {0x0000b2e4, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffffe0f0, 0xffffe0f0},
 892         {0x0000b2e8, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xfffcff00, 0xfffcff00},
 893 -       {0x0000c2dc, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xfffd5aaa, 0xfffd5aaa},
 894 -       {0x0000c2e0, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xfffe9ccc, 0xfffe9ccc},
 895 -       {0x0000c2e4, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xffffe0f0, 0xffffe0f0},
 896 +       {0x0000c2dc, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xfffd5aaa, 0xfffd5aaa},
 897 +       {0x0000c2e0, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffe9ccc, 0xfffe9ccc},
 898 +       {0x0000c2e4, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffffe0f0, 0xffffe0f0},
 899         {0x0000c2e8, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xfffcff00, 0xfffcff00},
 900         {0x00016044, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x010002d4, 0x010002d4},
 901 -       {0x00016048, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x66482401, 0x66482401},
 902 +       {0x00016048, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401},
 903         {0x00016280, 0x01801e84, 0x01801e84, 0x01801e84, 0x01801e84, 0x01801e84, 0x01801e84, 0x01808e84, 0x01808e84},
 904         {0x00016444, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x010002d4, 0x010002d4},
 905 -       {0x00016448, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x66482401, 0x66482401},
 906 +       {0x00016448, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401},
 907         {0x00016844, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x010002d4, 0x010002d4},
 908 -       {0x00016848, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x66482401, 0x66482401},
 909 +       {0x00016848, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401},
 910  };
 911
 912  static const u32 ar955x_1p0_mac_core[][2] = {
 913 @@ -846,7 +846,7 @@ static const u32 ar955x_1p0_baseband_cor
 914         {0x0000a44c, 0x00000001},
 915         {0x0000a450, 0x00010000},
 916         {0x0000a458, 0x00000000},
 917 -       {0x0000a644, 0x3fad9d74},
 918 +       {0x0000a644, 0xbfad9d74},
 919         {0x0000a648, 0x0048060a},
 920         {0x0000a64c, 0x00003c37},
 921         {0x0000a670, 0x03020100},
 922 @@ -1277,7 +1277,7 @@ static const u32 ar955x_1p0_modes_fast_c
 923         {0x0000801c, 0x148ec02b, 0x148ec057},
 924         {0x00008318, 0x000044c0, 0x00008980},
 925         {0x00009e00, 0x0372131c, 0x0372131c},
 926 -       {0x0000a230, 0x0000000b, 0x00000016},
 927 +       {0x0000a230, 0x0000400b, 0x00004016},
 928         {0x0000a254, 0x00000898, 0x00001130},
 929  };
 930
 931 --- a/drivers/net/wireless/ath/ath9k/htc_hst.c
 932 +++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
 933 @@ -347,6 +347,8 @@ void ath9k_htc_txcompletion_cb(struct ht
 934                         endpoint->ep_callbacks.tx(endpoint->ep_callbacks.priv,
 935                                                   skb, htc_hdr->endpoint_id,
 936                                                   txok);
 937 +               } else {
 938 +                       kfree_skb(skb);
 939                 }
 940         }
 941
 942 --- a/net/wireless/reg.c
 943 +++ b/net/wireless/reg.c
 944 @@ -142,8 +142,8 @@ static void rcu_free_regdom(const struct
 945
 946  static struct regulatory_request *get_last_request(void)
 947  {
 948 -       return rcu_dereference_protected(last_request,
 949 -                                        lockdep_is_held(&reg_mutex));
 950 +       return rcu_dereference_check(last_request,
 951 +                                    lockdep_is_held(&reg_mutex));
 952  }
 953
 954  /* Used to queue up regulatory hints */
 955 @@ -1850,7 +1850,7 @@ static void restore_regulatory_settings(
 956         mutex_lock(&cfg80211_mutex);
 957         mutex_lock(&reg_mutex);
 958
 959 -       reset_regdomains(true, cfg80211_world_regdom);
 960 +       reset_regdomains(true, &world_regdom);
 961         restore_alpha2(alpha2, reset_user);
 962
 963         /*
 964 @@ -2251,14 +2251,21 @@ int set_regdom(const struct ieee80211_re
 965
 966  int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 967  {
 968 -       struct regulatory_request *lr = get_last_request();
 969 +       struct regulatory_request *lr;
 970 +       u8 alpha2[2];
 971 +       bool add = false;
 972
 973 +       rcu_read_lock();
 974 +       lr = get_last_request();
 975         if (lr && !lr->processed) {
 976 -               if (add_uevent_var(env, "COUNTRY=%c%c",
 977 -                                  lr->alpha2[0], lr->alpha2[1]))
 978 -                       return -ENOMEM;
 979 +               memcpy(alpha2, lr->alpha2, 2);
 980 +               add = true;
 981         }
 982 +       rcu_read_unlock();
 983
 984 +       if (add)
 985 +               return add_uevent_var(env, "COUNTRY=%c%c",
 986 +                                     alpha2[0], alpha2[1]);
 987         return 0;
 988  }
 989