package/mac80211/patches/300-pending_work.patch

   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))
   5                         continue;
   6
   7 +               channels[count].max_power = AR5K_TUNE_MAX_TXPOWER/2;
   8 +
   9                 count++;
  10         }
  11
  12 --- a/net/mac80211/agg-rx.c
  13 +++ b/net/mac80211/agg-rx.c
  14 @@ -203,6 +203,8 @@ static void ieee80211_send_addba_resp(st
  15                 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
  16         else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
  17                 memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
  18 +       else if (sdata->vif.type == NL80211_IFTYPE_WDS)
  19 +               memcpy(mgmt->bssid, da, ETH_ALEN);
  20
  21         mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
  22                                           IEEE80211_STYPE_ACTION);
  23 --- a/net/mac80211/agg-tx.c
  24 +++ b/net/mac80211/agg-tx.c
  25 @@ -81,7 +81,8 @@ static void ieee80211_send_addba_request
  26         memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
  27         if (sdata->vif.type == NL80211_IFTYPE_AP ||
  28             sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
  29 -           sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
  30 +           sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
  31 +           sdata->vif.type == NL80211_IFTYPE_WDS)
  32                 memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
  33         else if (sdata->vif.type == NL80211_IFTYPE_STATION)
  34                 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
  35 @@ -460,6 +461,7 @@ int ieee80211_start_tx_ba_session(struct
  36             sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
  37             sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
  38             sdata->vif.type != NL80211_IFTYPE_AP &&
  39 +           sdata->vif.type != NL80211_IFTYPE_WDS &&
  40             sdata->vif.type != NL80211_IFTYPE_ADHOC)
  41                 return -EINVAL;
  42
  43 @@ -869,7 +871,7 @@ void ieee80211_process_addba_resp(struct
  44
  45         } else {
  46                 ___ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_INITIATOR,
  47 -                                               true);
  48 +                                               false);
  49         }
  50
  51   out:
  52 --- a/net/mac80211/debugfs_sta.c
  53 +++ b/net/mac80211/debugfs_sta.c
  54 @@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
  55         test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
  56
  57         int res = scnprintf(buf, sizeof(buf),
  58 -                           "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
  59 +                           "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
  60                             TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
  61                             TEST(PS_DRIVER), TEST(AUTHORIZED),
  62                             TEST(SHORT_PREAMBLE),
  63 -                           TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
  64 +                           TEST(WME), TEST(CLEAR_PS_FILT),
  65                             TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
  66                             TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
  67                             TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
  68 --- a/net/mac80211/iface.c
  69 +++ b/net/mac80211/iface.c
  70 @@ -420,7 +420,6 @@ int ieee80211_do_open(struct wireless_de
  71         struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
  72         struct net_device *dev = wdev->netdev;
  73         struct ieee80211_local *local = sdata->local;
  74 -       struct sta_info *sta;
  75         u32 changed = 0;
  76         int res;
  77         u32 hw_reconf_flags = 0;
  78 @@ -575,30 +574,8 @@ int ieee80211_do_open(struct wireless_de
  79
  80         set_bit(SDATA_STATE_RUNNING, &sdata->state);
  81
  82 -       if (sdata->vif.type == NL80211_IFTYPE_WDS) {
  83 -               /* Create STA entry for the WDS peer */
  84 -               sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
  85 -                                    GFP_KERNEL);
  86 -               if (!sta) {
  87 -                       res = -ENOMEM;
  88 -                       goto err_del_interface;
  89 -               }
  90 -
  91 -               sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
  92 -               sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
  93 -               sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
  94 -
  95 -               res = sta_info_insert(sta);
  96 -               if (res) {
  97 -                       /* STA has been freed */
  98 -                       goto err_del_interface;
  99 -               }
 100 -
 101 -               rate_control_rate_init(sta);
 102 -               netif_carrier_on(dev);
 103 -       } else if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE) {
 104 +       if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE)
 105                 rcu_assign_pointer(local->p2p_sdata, sdata);
 106 -       }
 107
 108         /*
 109          * set_multicast_list will be invoked by the networking core
 110 @@ -997,6 +974,72 @@ static void ieee80211_if_setup(struct ne
 111         dev->destructor = free_netdev;
 112  }
 113
 114 +static void ieee80211_wds_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
 115 +                                        struct sk_buff *skb)
 116 +{
 117 +       struct ieee80211_local *local = sdata->local;
 118 +       struct ieee80211_rx_status *rx_status;
 119 +       struct ieee802_11_elems elems;
 120 +       struct ieee80211_mgmt *mgmt;
 121 +       struct sta_info *sta;
 122 +       size_t baselen;
 123 +       u32 rates = 0;
 124 +       u16 stype;
 125 +       bool new = false;
 126 +       enum ieee80211_band band = local->hw.conf.channel->band;
 127 +       struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
 128 +
 129 +       rx_status = IEEE80211_SKB_RXCB(skb);
 130 +       mgmt = (struct ieee80211_mgmt *) skb->data;
 131 +       stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
 132 +
 133 +       if (stype != IEEE80211_STYPE_BEACON)
 134 +               return;
 135 +
 136 +       baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
 137 +       if (baselen > skb->len)
 138 +               return;
 139 +
 140 +       ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
 141 +                              skb->len - baselen, &elems);
 142 +
 143 +       rates = ieee80211_sta_get_rates(local, &elems, band, NULL);
 144 +
 145 +       rcu_read_lock();
 146 +
 147 +       sta = sta_info_get(sdata, sdata->u.wds.remote_addr);
 148 +
 149 +       if (!sta) {
 150 +               rcu_read_unlock();
 151 +               sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
 152 +                                    GFP_KERNEL);
 153 +               if (!sta)
 154 +                       return;
 155 +
 156 +               new = true;
 157 +       }
 158 +
 159 +       sta->last_rx = jiffies;
 160 +       sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
 161 +
 162 +       if (elems.ht_cap_elem)
 163 +               ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
 164 +                               elems.ht_cap_elem, &sta->sta.ht_cap);
 165 +
 166 +       if (elems.wmm_param)
 167 +               set_sta_flag(sta, WLAN_STA_WME);
 168 +
 169 +       if (new) {
 170 +               sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
 171 +               sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
 172 +               sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
 173 +               rate_control_rate_init(sta);
 174 +               sta_info_insert_rcu(sta);
 175 +       }
 176 +
 177 +       rcu_read_unlock();
 178 +}
 179 +
 180  static void ieee80211_iface_work(struct work_struct *work)
 181  {
 182         struct ieee80211_sub_if_data *sdata =
 183 @@ -1101,6 +1144,9 @@ static void ieee80211_iface_work(struct
 184                                 break;
 185                         ieee80211_mesh_rx_queued_mgmt(sdata, skb);
 186                         break;
 187 +               case NL80211_IFTYPE_WDS:
 188 +                       ieee80211_wds_rx_queued_mgmt(sdata, skb);
 189 +                       break;
 190                 default:
 191                         WARN(1, "frame for unexpected interface type");
 192                         break;
 193 --- a/net/mac80211/rx.c
 194 +++ b/net/mac80211/rx.c
 195 @@ -2279,6 +2279,7 @@ ieee80211_rx_h_action(struct ieee80211_r
 196                     sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
 197                     sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
 198                     sdata->vif.type != NL80211_IFTYPE_AP &&
 199 +                   sdata->vif.type != NL80211_IFTYPE_WDS &&
 200                     sdata->vif.type != NL80211_IFTYPE_ADHOC)
 201                         break;
 202
 203 @@ -2496,14 +2497,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
 204
 205         if (!ieee80211_vif_is_mesh(&sdata->vif) &&
 206             sdata->vif.type != NL80211_IFTYPE_ADHOC &&
 207 -           sdata->vif.type != NL80211_IFTYPE_STATION)
 208 +           sdata->vif.type != NL80211_IFTYPE_STATION &&
 209 +           sdata->vif.type != NL80211_IFTYPE_WDS)
 210                 return RX_DROP_MONITOR;
 211
 212         switch (stype) {
 213         case cpu_to_le16(IEEE80211_STYPE_AUTH):
 214         case cpu_to_le16(IEEE80211_STYPE_BEACON):
 215         case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
 216 -               /* process for all: mesh, mlme, ibss */
 217 +               /* process for all: mesh, mlme, ibss, wds */
 218                 break;
 219         case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
 220         case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
 221 @@ -2827,10 +2829,16 @@ static int prepare_for_handlers(struct i
 222                 }
 223                 break;
 224         case NL80211_IFTYPE_WDS:
 225 -               if (bssid || !ieee80211_is_data(hdr->frame_control))
 226 -                       return 0;
 227                 if (!ether_addr_equal(sdata->u.wds.remote_addr, hdr->addr2))
 228                         return 0;
 229 +
 230 +               if (ieee80211_is_data(hdr->frame_control) ||
 231 +                   ieee80211_is_action(hdr->frame_control)) {
 232 +                       if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
 233 +                               return 0;
 234 +               } else if (!ieee80211_is_beacon(hdr->frame_control))
 235 +                       return 0;
 236 +
 237                 break;
 238         case NL80211_IFTYPE_P2P_DEVICE:
 239                 if (!ieee80211_is_public_action(hdr, skb->len) &&
 240 --- a/net/mac80211/sta_info.h
 241 +++ b/net/mac80211/sta_info.h
 242 @@ -32,7 +32,6 @@
 243   * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
 244   *     frames.
 245   * @WLAN_STA_WME: Station is a QoS-STA.
 246 - * @WLAN_STA_WDS: Station is one of our WDS peers.
 247   * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
 248   *     IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
 249   *     frame to this station is transmitted.
 250 @@ -64,7 +63,6 @@ enum ieee80211_sta_info_flags {
 251         WLAN_STA_AUTHORIZED,
 252         WLAN_STA_SHORT_PREAMBLE,
 253         WLAN_STA_WME,
 254 -       WLAN_STA_WDS,
 255         WLAN_STA_CLEAR_PS_FILT,
 256         WLAN_STA_MFP,
 257         WLAN_STA_BLOCK_BA,
 258 --- a/net/mac80211/status.c
 259 +++ b/net/mac80211/status.c
 260 @@ -324,6 +324,75 @@ static void ieee80211_add_tx_radiotap_he
 261
 262  }
 263
 264 +static void ieee80211_report_used_skb(struct ieee80211_local *local,
 265 +                                     struct sk_buff *skb, bool dropped)
 266 +{
 267 +       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
 268 +       struct ieee80211_hdr *hdr = (void *)skb->data;
 269 +       bool acked = info->flags & IEEE80211_TX_STAT_ACK;
 270 +
 271 +       if (dropped)
 272 +               acked = false;
 273 +
 274 +       if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) {
 275 +               struct ieee80211_sub_if_data *sdata = NULL;
 276 +               struct ieee80211_sub_if_data *iter_sdata;
 277 +               u64 cookie = (unsigned long)skb;
 278 +
 279 +               rcu_read_lock();
 280 +
 281 +               if (skb->dev) {
 282 +                       list_for_each_entry_rcu(iter_sdata, &local->interfaces,
 283 +                                               list) {
 284 +                               if (!iter_sdata->dev)
 285 +                                       continue;
 286 +
 287 +                               if (skb->dev == iter_sdata->dev) {
 288 +                                       sdata = iter_sdata;
 289 +                                       break;
 290 +                               }
 291 +                       }
 292 +               } else {
 293 +                       sdata = rcu_dereference(local->p2p_sdata);
 294 +               }
 295 +
 296 +               if (!sdata)
 297 +                       skb->dev = NULL;
 298 +               else if (ieee80211_is_nullfunc(hdr->frame_control) ||
 299 +                        ieee80211_is_qos_nullfunc(hdr->frame_control)) {
 300 +                       cfg80211_probe_status(sdata->dev, hdr->addr1,
 301 +                                             cookie, acked, GFP_ATOMIC);
 302 +               } else {
 303 +                       cfg80211_mgmt_tx_status(&sdata->wdev, cookie, skb->data,
 304 +                                               skb->len, acked, GFP_ATOMIC);
 305 +               }
 306 +
 307 +               rcu_read_unlock();
 308 +       }
 309 +
 310 +       if (unlikely(info->ack_frame_id)) {
 311 +               struct sk_buff *ack_skb;
 312 +               unsigned long flags;
 313 +
 314 +               spin_lock_irqsave(&local->ack_status_lock, flags);
 315 +               ack_skb = idr_find(&local->ack_status_frames,
 316 +                                  info->ack_frame_id);
 317 +               if (ack_skb)
 318 +                       idr_remove(&local->ack_status_frames,
 319 +                                  info->ack_frame_id);
 320 +               spin_unlock_irqrestore(&local->ack_status_lock, flags);
 321 +
 322 +               if (ack_skb) {
 323 +                       if (!dropped) {
 324 +                               /* consumes ack_skb */
 325 +                               skb_complete_wifi_ack(ack_skb, acked);
 326 +                       } else {
 327 +                               dev_kfree_skb_any(ack_skb);
 328 +                       }
 329 +               }
 330 +       }
 331 +}
 332 +
 333  /*
 334   * Use a static threshold for now, best value to be determined
 335   * by testing ...
 336 @@ -515,50 +584,7 @@ void ieee80211_tx_status(struct ieee8021
 337                                         msecs_to_jiffies(10));
 338         }
 339
 340 -       if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) {
 341 -               u64 cookie = (unsigned long)skb;
 342 -               acked = info->flags & IEEE80211_TX_STAT_ACK;
 343 -
 344 -               if (ieee80211_is_nullfunc(hdr->frame_control) ||
 345 -                   ieee80211_is_qos_nullfunc(hdr->frame_control)) {
 346 -                       cfg80211_probe_status(skb->dev, hdr->addr1,
 347 -                                             cookie, acked, GFP_ATOMIC);
 348 -               } else if (skb->dev) {
 349 -                       cfg80211_mgmt_tx_status(
 350 -                               skb->dev->ieee80211_ptr, cookie, skb->data,
 351 -                               skb->len, acked, GFP_ATOMIC);
 352 -               } else {
 353 -                       struct ieee80211_sub_if_data *p2p_sdata;
 354 -
 355 -                       rcu_read_lock();
 356 -
 357 -                       p2p_sdata = rcu_dereference(local->p2p_sdata);
 358 -                       if (p2p_sdata) {
 359 -                               cfg80211_mgmt_tx_status(
 360 -                                       &p2p_sdata->wdev, cookie, skb->data,
 361 -                                       skb->len, acked, GFP_ATOMIC);
 362 -                       }
 363 -                       rcu_read_unlock();
 364 -               }
 365 -       }
 366 -
 367 -       if (unlikely(info->ack_frame_id)) {
 368 -               struct sk_buff *ack_skb;
 369 -               unsigned long flags;
 370 -
 371 -               spin_lock_irqsave(&local->ack_status_lock, flags);
 372 -               ack_skb = idr_find(&local->ack_status_frames,
 373 -                                  info->ack_frame_id);
 374 -               if (ack_skb)
 375 -                       idr_remove(&local->ack_status_frames,
 376 -                                  info->ack_frame_id);
 377 -               spin_unlock_irqrestore(&local->ack_status_lock, flags);
 378 -
 379 -               /* consumes ack_skb */
 380 -               if (ack_skb)
 381 -                       skb_complete_wifi_ack(ack_skb,
 382 -                               info->flags & IEEE80211_TX_STAT_ACK);
 383 -       }
 384 +       ieee80211_report_used_skb(local, skb, false);
 385
 386         /* this was a transmitted frame, but now we want to reuse it */
 387         skb_orphan(skb);
 388 @@ -634,25 +660,8 @@ EXPORT_SYMBOL(ieee80211_report_low_ack);
 389  void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb)
 390  {
 391         struct ieee80211_local *local = hw_to_local(hw);
 392 -       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
 393 -
 394 -       if (unlikely(info->ack_frame_id)) {
 395 -               struct sk_buff *ack_skb;
 396 -               unsigned long flags;
 397 -
 398 -               spin_lock_irqsave(&local->ack_status_lock, flags);
 399 -               ack_skb = idr_find(&local->ack_status_frames,
 400 -                                  info->ack_frame_id);
 401 -               if (ack_skb)
 402 -                       idr_remove(&local->ack_status_frames,
 403 -                                  info->ack_frame_id);
 404 -               spin_unlock_irqrestore(&local->ack_status_lock, flags);
 405 -
 406 -               /* consumes ack_skb */
 407 -               if (ack_skb)
 408 -                       dev_kfree_skb_any(ack_skb);
 409 -       }
 410
 411 +       ieee80211_report_used_skb(local, skb, true);
 412         dev_kfree_skb_any(skb);
 413  }
 414  EXPORT_SYMBOL(ieee80211_free_txskb);
 415 --- a/drivers/net/wireless/p54/main.c
 416 +++ b/drivers/net/wireless/p54/main.c
 417 @@ -139,6 +139,7 @@ static int p54_beacon_format_ie_tim(stru
 418  static int p54_beacon_update(struct p54_common *priv,
 419                         struct ieee80211_vif *vif)
 420  {
 421 +       struct ieee80211_tx_control control = { };
 422         struct sk_buff *beacon;
 423         int ret;
 424
 425 @@ -158,7 +159,7 @@ static int p54_beacon_update(struct p54_
 426          * to cancel the old beacon template by hand, instead the firmware
 427          * will release the previous one through the feedback mechanism.
 428          */
 429 -       p54_tx_80211(priv->hw, NULL, beacon);
 430 +       p54_tx_80211(priv->hw, &control, beacon);
 431         priv->tsf_high32 = 0;
 432         priv->tsf_low32 = 0;
 433
 434 --- a/net/wireless/reg.c
 435 +++ b/net/wireless/reg.c
 436 @@ -352,6 +352,9 @@ static void reg_regdb_search(struct work
 437         struct reg_regdb_search_request *request;
 438         const struct ieee80211_regdomain *curdom, *regdom;
 439         int i, r;
 440 +       bool set_reg = false;
 441 +
 442 +       mutex_lock(&cfg80211_mutex);
 443
 444         mutex_lock(&reg_regdb_search_mutex);
 445         while (!list_empty(&reg_regdb_search_list)) {
 446 @@ -367,9 +370,7 @@ static void reg_regdb_search(struct work
 447                                 r = reg_copy_regd(&regdom, curdom);
 448                                 if (r)
 449                                         break;
 450 -                               mutex_lock(&cfg80211_mutex);
 451 -                               set_regdom(regdom);
 452 -                               mutex_unlock(&cfg80211_mutex);
 453 +                               set_reg = true;
 454                                 break;
 455                         }
 456                 }
 457 @@ -377,6 +378,11 @@ static void reg_regdb_search(struct work
 458                 kfree(request);
 459         }
 460         mutex_unlock(&reg_regdb_search_mutex);
 461 +
 462 +       if (set_reg)
 463 +               set_regdom(regdom);
 464 +
 465 +       mutex_unlock(&cfg80211_mutex);
 466  }
 467
 468  static DECLARE_WORK(reg_regdb_work, reg_regdb_search);
 469 --- a/drivers/net/wireless/ath/ath9k/recv.c
 470 +++ b/drivers/net/wireless/ath/ath9k/recv.c
 471 @@ -424,8 +424,8 @@ u32 ath_calcrxfilter(struct ath_softc *s
 472                 rfilt |= ATH9K_RX_FILTER_COMP_BAR;
 473
 474         if (sc->nvifs > 1 || (sc->rx.rxfilter & FIF_OTHER_BSS)) {
 475 -               /* The following may also be needed for other older chips */
 476 -               if (sc->sc_ah->hw_version.macVersion == AR_SREV_VERSION_9160)
 477 +               /* This is needed for older chips */
 478 +               if (sc->sc_ah->hw_version.macVersion <= AR_SREV_VERSION_9160)
 479                         rfilt |= ATH9K_RX_FILTER_PROM;
 480                 rfilt |= ATH9K_RX_FILTER_MCAST_BCAST_ALL;
 481         }
 482 --- a/net/mac80211/mlme.c
 483 +++ b/net/mac80211/mlme.c
 484 @@ -818,23 +818,71 @@ void ieee80211_sta_process_chanswitch(st
 485  }
 486
 487  static void ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata,
 488 -                                       u16 capab_info, u8 *pwr_constr_elem,
 489 -                                       u8 pwr_constr_elem_len)
 490 +                                       struct ieee80211_channel *channel,
 491 +                                       const u8 *country_ie, u8 country_ie_len,
 492 +                                       const u8 *pwr_constr_elem)
 493  {
 494 -       struct ieee80211_conf *conf = &sdata->local->hw.conf;
 495 +       struct ieee80211_country_ie_triplet *triplet;
 496 +       int chan = ieee80211_frequency_to_channel(channel->center_freq);
 497 +       int i, chan_pwr, chan_increment, new_ap_level;
 498 +       bool have_chan_pwr = false;
 499
 500 -       if (!(capab_info & WLAN_CAPABILITY_SPECTRUM_MGMT))
 501 +       /* Invalid IE */
 502 +       if (country_ie_len % 2 || country_ie_len < IEEE80211_COUNTRY_IE_MIN_LEN)
 503                 return;
 504
 505 -       /* Power constraint IE length should be 1 octet */
 506 -       if (pwr_constr_elem_len != 1)
 507 -               return;
 508 +       triplet = (void *)(country_ie + 3);
 509 +       country_ie_len -= 3;
 510
 511 -       if ((*pwr_constr_elem <= conf->channel->max_reg_power) &&
 512 -           (*pwr_constr_elem != sdata->local->power_constr_level)) {
 513 -               sdata->local->power_constr_level = *pwr_constr_elem;
 514 -               ieee80211_hw_config(sdata->local, 0);
 515 +       switch (channel->band) {
 516 +       default:
 517 +               WARN_ON_ONCE(1);
 518 +               /* fall through */
 519 +       case IEEE80211_BAND_2GHZ:
 520 +       case IEEE80211_BAND_60GHZ:
 521 +               chan_increment = 1;
 522 +               break;
 523 +       case IEEE80211_BAND_5GHZ:
 524 +               chan_increment = 4;
 525 +               break;
 526         }
 527 +
 528 +       /* find channel */
 529 +       while (country_ie_len >= 3) {
 530 +               u8 first_channel = triplet->chans.first_channel;
 531 +
 532 +               if (first_channel >= IEEE80211_COUNTRY_EXTENSION_ID)
 533 +                       goto next;
 534 +
 535 +               for (i = 0; i < triplet->chans.num_channels; i++) {
 536 +                       if (first_channel + i * chan_increment == chan) {
 537 +                               have_chan_pwr = true;
 538 +                               chan_pwr = triplet->chans.max_power;
 539 +                               break;
 540 +                       }
 541 +               }
 542 +               if (have_chan_pwr)
 543 +                       break;
 544 +
 545 + next:
 546 +               triplet++;
 547 +               country_ie_len -= 3;
 548 +       }
 549 +
 550 +       if (!have_chan_pwr)
 551 +               return;
 552 +
 553 +       new_ap_level = max_t(int, 0, chan_pwr - *pwr_constr_elem);
 554 +
 555 +       if (sdata->local->ap_power_level == new_ap_level)
 556 +               return;
 557 +
 558 +       sdata_info(sdata,
 559 +                  "Limiting TX power to %d (%d - %d) dBm as advertised by %pM\n",
 560 +                  new_ap_level, chan_pwr, *pwr_constr_elem,
 561 +                  sdata->u.mgd.bssid);
 562 +       sdata->local->ap_power_level = new_ap_level;
 563 +       ieee80211_hw_config(sdata->local, 0);
 564  }
 565
 566  void ieee80211_enable_dyn_ps(struct ieee80211_vif *vif)
 567 @@ -1390,7 +1438,7 @@ static void ieee80211_set_disassoc(struc
 568         sta = sta_info_get(sdata, ifmgd->bssid);
 569         if (sta) {
 570                 set_sta_flag(sta, WLAN_STA_BLOCK_BA);
 571 -               ieee80211_sta_tear_down_BA_sessions(sta, tx);
 572 +               ieee80211_sta_tear_down_BA_sessions(sta, false);
 573         }
 574         mutex_unlock(&local->sta_mtx);
 575
 576 @@ -1438,7 +1486,7 @@ static void ieee80211_set_disassoc(struc
 577         memset(&ifmgd->ht_capa, 0, sizeof(ifmgd->ht_capa));
 578         memset(&ifmgd->ht_capa_mask, 0, sizeof(ifmgd->ht_capa_mask));
 579
 580 -       local->power_constr_level = 0;
 581 +       local->ap_power_level = 0;
 582
 583         del_timer_sync(&local->dynamic_ps_timer);
 584         cancel_work_sync(&local->dynamic_ps_enable_work);
 585 @@ -2530,15 +2578,13 @@ static void ieee80211_rx_mgmt_beacon(str
 586                                                   bssid, true);
 587         }
 588
 589 -       /* Note: country IE parsing is done for us by cfg80211 */
 590 -       if (elems.country_elem) {
 591 -               /* TODO: IBSS also needs this */
 592 -               if (elems.pwr_constr_elem)
 593 -                       ieee80211_handle_pwr_constr(sdata,
 594 -                               le16_to_cpu(mgmt->u.probe_resp.capab_info),
 595 -                               elems.pwr_constr_elem,
 596 -                               elems.pwr_constr_elem_len);
 597 -       }
 598 +       if (elems.country_elem && elems.pwr_constr_elem &&
 599 +           mgmt->u.probe_resp.capab_info &
 600 +                               cpu_to_le16(WLAN_CAPABILITY_SPECTRUM_MGMT))
 601 +               ieee80211_handle_pwr_constr(sdata, local->oper_channel,
 602 +                                           elems.country_elem,
 603 +                                           elems.country_elem_len,
 604 +                                           elems.pwr_constr_elem);
 605
 606         ieee80211_bss_info_change_notify(sdata, changed);
 607  }
 608 @@ -3526,6 +3572,7 @@ int ieee80211_mgd_deauth(struct ieee8021
 609  {
 610         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
 611         u8 frame_buf[DEAUTH_DISASSOC_LEN];
 612 +       bool tx = !req->local_state_change;
 613
 614         mutex_lock(&ifmgd->mtx);
 615
 616 @@ -3542,12 +3589,12 @@ int ieee80211_mgd_deauth(struct ieee8021
 617         if (ifmgd->associated &&
 618             ether_addr_equal(ifmgd->associated->bssid, req->bssid)) {
 619                 ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
 620 -                                      req->reason_code, true, frame_buf);
 621 +                                      req->reason_code, tx, frame_buf);
 622         } else {
 623                 drv_mgd_prepare_tx(sdata->local, sdata);
 624                 ieee80211_send_deauth_disassoc(sdata, req->bssid,
 625                                                IEEE80211_STYPE_DEAUTH,
 626 -                                              req->reason_code, true,
 627 +                                              req->reason_code, tx,
 628                                                frame_buf);
 629         }
 630
 631 --- a/net/mac80211/sta_info.c
 632 +++ b/net/mac80211/sta_info.c
 633 @@ -674,7 +674,7 @@ int __must_check __sta_info_destroy(stru
 634          * will be sufficient.
 635          */
 636         set_sta_flag(sta, WLAN_STA_BLOCK_BA);
 637 -       ieee80211_sta_tear_down_BA_sessions(sta, true);
 638 +       ieee80211_sta_tear_down_BA_sessions(sta, false);
 639
 640         ret = sta_info_hash_del(local, sta);
 641         if (ret)
 642 --- a/drivers/net/wireless/ath/ath5k/phy.c
 643 +++ b/drivers/net/wireless/ath/ath5k/phy.c
 644 @@ -1977,11 +1977,13 @@ ath5k_hw_set_spur_mitigation_filter(stru
 645                         spur_delta_phase = (spur_offset << 18) / 25;
 646                         spur_freq_sigma_delta = (spur_delta_phase >> 10);
 647                         symbol_width = AR5K_SPUR_SYMBOL_WIDTH_BASE_100Hz / 2;
 648 +                       break;
 649                 case AR5K_BWMODE_5MHZ:
 650                         /* Both sample_freq and chip_freq are 10MHz (?) */
 651                         spur_delta_phase = (spur_offset << 19) / 25;
 652                         spur_freq_sigma_delta = (spur_delta_phase >> 10);
 653                         symbol_width = AR5K_SPUR_SYMBOL_WIDTH_BASE_100Hz / 4;
 654 +                       break;
 655                 default:
 656                         if (channel->band == IEEE80211_BAND_5GHZ) {
 657                                 /* Both sample_freq and chip_freq are 40MHz */
 658 --- a/net/mac80211/ieee80211_i.h
 659 +++ b/net/mac80211/ieee80211_i.h
 660 @@ -1062,7 +1062,7 @@ struct ieee80211_local {
 661         bool disable_dynamic_ps;
 662
 663         int user_power_level; /* in dBm */
 664 -       int power_constr_level; /* in dBm */
 665 +       int ap_power_level; /* in dBm */
 666
 667         enum ieee80211_smps_mode smps_mode;
 668
 669 @@ -1170,7 +1170,6 @@ struct ieee802_11_elems {
 670         u8 prep_len;
 671         u8 perr_len;
 672         u8 country_elem_len;
 673 -       u8 pwr_constr_elem_len;
 674         u8 quiet_elem_len;
 675         u8 num_of_quiet_elem;   /* can be more the one */
 676         u8 timeout_int_len;
 677 --- a/net/mac80211/util.c
 678 +++ b/net/mac80211/util.c
 679 @@ -792,8 +792,11 @@ u32 ieee802_11_parse_elems_crc(u8 *start
 680                         elems->country_elem_len = elen;
 681                         break;
 682                 case WLAN_EID_PWR_CONSTRAINT:
 683 +                       if (elen != 1) {
 684 +                               elem_parse_failed = true;
 685 +                               break;
 686 +                       }
 687                         elems->pwr_constr_elem = pos;
 688 -                       elems->pwr_constr_elem_len = elen;
 689                         break;
 690                 case WLAN_EID_TIMEOUT_INTERVAL:
 691                         elems->timeout_int = pos;
 692 --- a/net/mac80211/main.c
 693 +++ b/net/mac80211/main.c
 694 @@ -154,13 +154,11 @@ int ieee80211_hw_config(struct ieee80211
 695
 696         if (test_bit(SCAN_SW_SCANNING, &local->scanning) ||
 697             test_bit(SCAN_ONCHANNEL_SCANNING, &local->scanning) ||
 698 -           test_bit(SCAN_HW_SCANNING, &local->scanning))
 699 +           test_bit(SCAN_HW_SCANNING, &local->scanning) ||
 700 +           !local->ap_power_level)
 701                 power = chan->max_power;
 702         else
 703 -               power = local->power_constr_level ?
 704 -                       min(chan->max_power,
 705 -                               (chan->max_reg_power  - local->power_constr_level)) :
 706 -                       chan->max_power;
 707 +               power = min(chan->max_power, local->ap_power_level);
 708
 709         if (local->user_power_level >= 0)
 710                 power = min(power, local->user_power_level);
 711 --- a/include/net/cfg80211.h
 712 +++ b/include/net/cfg80211.h
 713 @@ -1218,6 +1218,7 @@ struct cfg80211_deauth_request {
 714         const u8 *ie;
 715         size_t ie_len;
 716         u16 reason_code;
 717 +       bool local_state_change;
 718  };
 719
 720  /**
 721 --- a/net/wireless/mlme.c
 722 +++ b/net/wireless/mlme.c
 723 @@ -457,20 +457,14 @@ int __cfg80211_mlme_deauth(struct cfg802
 724                 .reason_code = reason,
 725                 .ie = ie,
 726                 .ie_len = ie_len,
 727 +               .local_state_change = local_state_change,
 728         };
 729
 730         ASSERT_WDEV_LOCK(wdev);
 731
 732 -       if (local_state_change) {
 733 -               if (wdev->current_bss &&
 734 -                   ether_addr_equal(wdev->current_bss->pub.bssid, bssid)) {
 735 -                       cfg80211_unhold_bss(wdev->current_bss);
 736 -                       cfg80211_put_bss(&wdev->current_bss->pub);
 737 -                       wdev->current_bss = NULL;
 738 -               }
 739 -
 740 +       if (local_state_change && (!wdev->current_bss ||
 741 +           !ether_addr_equal(wdev->current_bss->pub.bssid, bssid)))
 742                 return 0;
 743 -       }
 744
 745         return rdev->ops->deauth(&rdev->wiphy, dev, &req);
 746  }
 747 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 748 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
 749 @@ -386,7 +386,7 @@ static void ath_tx_complete_aggr(struct
 750         u16 seq_st = 0, acked_cnt = 0, txfail_cnt = 0, seq_first;
 751         u32 ba[WME_BA_BMP_SIZE >> 5];
 752         int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0;
 753 -       bool rc_update = true;
 754 +       bool rc_update = true, isba;
 755         struct ieee80211_tx_rate rates[4];
 756         struct ath_frame_info *fi;
 757         int nframes;
 758 @@ -430,13 +430,17 @@ static void ath_tx_complete_aggr(struct
 759         tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK;
 760         tid = ATH_AN_2_TID(an, tidno);
 761         seq_first = tid->seq_start;
 762 +       isba = ts->ts_flags & ATH9K_TX_BA;
 763
 764         /*
 765          * The hardware occasionally sends a tx status for the wrong TID.
 766          * In this case, the BA status cannot be considered valid and all
 767          * subframes need to be retransmitted
 768 +        *
 769 +        * Only BlockAcks have a TID and therefore normal Acks cannot be
 770 +        * checked
 771          */
 772 -       if (tidno != ts->tid)
 773 +       if (isba && tidno != ts->tid)
 774                 txok = false;
 775
 776         isaggr = bf_isaggr(bf);
 777 --- a/net/mac80211/cfg.c
 778 +++ b/net/mac80211/cfg.c
 779 @@ -2563,6 +2563,9 @@ static void ieee80211_mgmt_frame_registe
 780                 else
 781                         local->probe_req_reg--;
 782
 783 +               if (!local->open_count)
 784 +                       break;
 785 +
 786                 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
 787                 break;
 788         default: