package/mac80211/patches/300-pending_work.patch

   1 --- a/drivers/net/wireless/rt2x00/rt2800lib.c
   2 +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
   3 @@ -5090,7 +5090,8 @@ static int rt2800_probe_hw_mode(struct r
   4             IEEE80211_HW_SUPPORTS_PS |
   5             IEEE80211_HW_PS_NULLFUNC_STACK |
   6             IEEE80211_HW_AMPDU_AGGREGATION |
   7 -           IEEE80211_HW_REPORTS_TX_ACK_STATUS;
   8 +           IEEE80211_HW_REPORTS_TX_ACK_STATUS |
   9 +           IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL;
  10
  11         /*
  12          * Don't set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING for USB devices
  13 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
  14 +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
  15 @@ -392,10 +392,9 @@ void rt2x00lib_txdone(struct queue_entry
  16                 tx_info->flags |= IEEE80211_TX_STAT_AMPDU;
  17                 tx_info->status.ampdu_len = 1;
  18                 tx_info->status.ampdu_ack_len = success ? 1 : 0;
  19 -               /*
  20 -                * TODO: Need to tear down BA session here
  21 -                * if not successful.
  22 -                */
  23 +
  24 +               if (!success)
  25 +                       tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
  26         }
  27
  28         if (rate_flags & IEEE80211_TX_RC_USE_RTS_CTS) {
  29 --- a/include/net/mac80211.h
  30 +++ b/include/net/mac80211.h
  31 @@ -173,7 +173,7 @@ struct ieee80211_chanctx_conf {
  32
  33         u8 rx_chains_static, rx_chains_dynamic;
  34
  35 -       u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
  36 +       u8 drv_priv[0] __aligned(sizeof(void *));
  37  };
  38
  39  /**
  40 @@ -1059,7 +1059,7 @@ struct ieee80211_vif {
  41         u32 driver_flags;
  42
  43         /* must be last */
  44 -       u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
  45 +       u8 drv_priv[0] __aligned(sizeof(void *));
  46  };
  47
  48  static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif)
  49 @@ -1209,7 +1209,7 @@ struct ieee80211_sta {
  50         u8 max_sp;
  51
  52         /* must be last */
  53 -       u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
  54 +       u8 drv_priv[0] __aligned(sizeof(void *));
  55  };
  56
  57  /**
  58 @@ -1369,6 +1369,10 @@ struct ieee80211_tx_control {
  59   * @IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF: Use the P2P Device address for any
  60   *     P2P Interface. This will be honoured even if more than one interface
  61   *     is supported.
  62 + *
  63 + * @IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL: On this hardware TX BA session
  64 + *     should be tear down once BAR frame will not be acked.
  65 + *
  66   */
  67  enum ieee80211_hw_flags {
  68         IEEE80211_HW_HAS_RATE_CONTROL                   = 1<<0,
  69 @@ -1397,6 +1401,7 @@ enum ieee80211_hw_flags {
  70         IEEE80211_HW_TX_AMPDU_SETUP_IN_HW               = 1<<23,
  71         IEEE80211_HW_SCAN_WHILE_IDLE                    = 1<<24,
  72         IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF              = 1<<25,
  73 +       IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL          = 1<<26,
  74  };
  75
  76  /**
  77 --- a/net/mac80211/agg-rx.c
  78 +++ b/net/mac80211/agg-rx.c
  79 @@ -203,6 +203,8 @@ static void ieee80211_send_addba_resp(st
  80                 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
  81         else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
  82                 memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
  83 +       else if (sdata->vif.type == NL80211_IFTYPE_WDS)
  84 +               memcpy(mgmt->bssid, da, ETH_ALEN);
  85
  86         mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
  87                                           IEEE80211_STYPE_ACTION);
  88 --- a/net/mac80211/agg-tx.c
  89 +++ b/net/mac80211/agg-tx.c
  90 @@ -81,7 +81,8 @@ static void ieee80211_send_addba_request
  91         memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
  92         if (sdata->vif.type == NL80211_IFTYPE_AP ||
  93             sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
  94 -           sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
  95 +           sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
  96 +           sdata->vif.type == NL80211_IFTYPE_WDS)
  97                 memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
  98         else if (sdata->vif.type == NL80211_IFTYPE_STATION)
  99                 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
 100 @@ -460,6 +461,7 @@ int ieee80211_start_tx_ba_session(struct
 101             sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
 102             sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
 103             sdata->vif.type != NL80211_IFTYPE_AP &&
 104 +           sdata->vif.type != NL80211_IFTYPE_WDS &&
 105             sdata->vif.type != NL80211_IFTYPE_ADHOC)
 106                 return -EINVAL;
 107
 108 --- a/net/mac80211/debugfs_sta.c
 109 +++ b/net/mac80211/debugfs_sta.c
 110 @@ -65,11 +65,11 @@ static ssize_t sta_flags_read(struct fil
 111         test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
 112
 113         int res = scnprintf(buf, sizeof(buf),
 114 -                           "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
 115 +                           "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
 116                             TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
 117                             TEST(PS_DRIVER), TEST(AUTHORIZED),
 118                             TEST(SHORT_PREAMBLE),
 119 -                           TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
 120 +                           TEST(WME), TEST(CLEAR_PS_FILT),
 121                             TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
 122                             TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
 123                             TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
 124 --- a/net/mac80211/ibss.c
 125 +++ b/net/mac80211/ibss.c
 126 @@ -201,6 +201,20 @@ static void __ieee80211_sta_join_ibss(st
 127         bss_change |= BSS_CHANGED_BASIC_RATES;
 128         bss_change |= BSS_CHANGED_HT;
 129         bss_change |= BSS_CHANGED_IBSS;
 130 +
 131 +       /*
 132 +        * In 5 GHz/802.11a, we can always use short slot time.
 133 +        * (IEEE 802.11-2012 18.3.8.7)
 134 +        *
 135 +        * In 2.4GHz, we must always use long slots in IBSS for compatibility
 136 +        * reasons.
 137 +        * (IEEE 802.11-2012 19.4.5)
 138 +        *
 139 +        * HT follows these specifications (IEEE 802.11-2012 20.3.18)
 140 +        */
 141 +       sdata->vif.bss_conf.use_short_slot = chan->band == IEEE80211_BAND_5GHZ;
 142 +       bss_change |= BSS_CHANGED_ERP_SLOT;
 143 +
 144         sdata->vif.bss_conf.ibss_joined = true;
 145         sdata->vif.bss_conf.ibss_creator = creator;
 146         ieee80211_bss_info_change_notify(sdata, bss_change);
 147 --- a/net/mac80211/iface.c
 148 +++ b/net/mac80211/iface.c
 149 @@ -508,9 +508,9 @@ static void ieee80211_del_virtual_monito
 150  int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
 151  {
 152         struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
 153 +       struct ieee80211_sub_if_data *ap_sdata;
 154         struct net_device *dev = wdev->netdev;
 155         struct ieee80211_local *local = sdata->local;
 156 -       struct sta_info *sta;
 157         u32 changed = 0;
 158         int res;
 159         u32 hw_reconf_flags = 0;
 160 @@ -587,10 +587,14 @@ int ieee80211_do_open(struct wireless_de
 161         switch (sdata->vif.type) {
 162         case NL80211_IFTYPE_AP_VLAN:
 163                 /* no need to tell driver, but set carrier */
 164 -               if (rtnl_dereference(sdata->bss->beacon))
 165 -                       netif_carrier_on(dev);
 166 -               else
 167 +               if (!rtnl_dereference(sdata->bss->beacon)) {
 168                         netif_carrier_off(dev);
 169 +                       break;
 170 +               }
 171 +
 172 +               ap_sdata = get_bss_sdata(sdata);
 173 +               ieee80211_vif_copy_channel(sdata, ap_sdata);
 174 +               netif_carrier_on(dev);
 175                 break;
 176         case NL80211_IFTYPE_MONITOR:
 177                 if (sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES) {
 178 @@ -665,30 +669,8 @@ int ieee80211_do_open(struct wireless_de
 179
 180         set_bit(SDATA_STATE_RUNNING, &sdata->state);
 181
 182 -       if (sdata->vif.type == NL80211_IFTYPE_WDS) {
 183 -               /* Create STA entry for the WDS peer */
 184 -               sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
 185 -                                    GFP_KERNEL);
 186 -               if (!sta) {
 187 -                       res = -ENOMEM;
 188 -                       goto err_del_interface;
 189 -               }
 190 -
 191 -               sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
 192 -               sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
 193 -               sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
 194 -
 195 -               res = sta_info_insert(sta);
 196 -               if (res) {
 197 -                       /* STA has been freed */
 198 -                       goto err_del_interface;
 199 -               }
 200 -
 201 -               rate_control_rate_init(sta);
 202 -               netif_carrier_on(dev);
 203 -       } else if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE) {
 204 +       if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE)
 205                 rcu_assign_pointer(local->p2p_sdata, sdata);
 206 -       }
 207
 208         /*
 209          * set_multicast_list will be invoked by the networking core
 210 @@ -844,6 +826,8 @@ static void ieee80211_do_stop(struct iee
 211         switch (sdata->vif.type) {
 212         case NL80211_IFTYPE_AP_VLAN:
 213                 list_del(&sdata->u.vlan.list);
 214 +               netif_carrier_off(sdata->dev);
 215 +               ieee80211_vif_release_channel(sdata);
 216                 /* no need to tell driver */
 217                 break;
 218         case NL80211_IFTYPE_MONITOR:
 219 @@ -1072,6 +1056,72 @@ static void ieee80211_if_setup(struct ne
 220         dev->destructor = free_netdev;
 221  }
 222
 223 +static void ieee80211_wds_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
 224 +                                        struct sk_buff *skb)
 225 +{
 226 +       struct ieee80211_local *local = sdata->local;
 227 +       struct ieee80211_rx_status *rx_status;
 228 +       struct ieee802_11_elems elems;
 229 +       struct ieee80211_mgmt *mgmt;
 230 +       struct sta_info *sta;
 231 +       size_t baselen;
 232 +       u32 rates = 0;
 233 +       u16 stype;
 234 +       bool new = false;
 235 +       enum ieee80211_band band = local->hw.conf.channel->band;
 236 +       struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
 237 +
 238 +       rx_status = IEEE80211_SKB_RXCB(skb);
 239 +       mgmt = (struct ieee80211_mgmt *) skb->data;
 240 +       stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
 241 +
 242 +       if (stype != IEEE80211_STYPE_BEACON)
 243 +               return;
 244 +
 245 +       baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
 246 +       if (baselen > skb->len)
 247 +               return;
 248 +
 249 +       ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
 250 +                              skb->len - baselen, &elems);
 251 +
 252 +       rates = ieee80211_sta_get_rates(local, &elems, band, NULL);
 253 +
 254 +       rcu_read_lock();
 255 +
 256 +       sta = sta_info_get(sdata, sdata->u.wds.remote_addr);
 257 +
 258 +       if (!sta) {
 259 +               rcu_read_unlock();
 260 +               sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
 261 +                                    GFP_KERNEL);
 262 +               if (!sta)
 263 +                       return;
 264 +
 265 +               new = true;
 266 +       }
 267 +
 268 +       sta->last_rx = jiffies;
 269 +       sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
 270 +
 271 +       if (elems.ht_cap_elem)
 272 +               ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
 273 +                               elems.ht_cap_elem, &sta->sta.ht_cap);
 274 +
 275 +       if (elems.wmm_param)
 276 +               set_sta_flag(sta, WLAN_STA_WME);
 277 +
 278 +       if (new) {
 279 +               sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
 280 +               sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
 281 +               sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
 282 +               rate_control_rate_init(sta);
 283 +               sta_info_insert_rcu(sta);
 284 +       }
 285 +
 286 +       rcu_read_unlock();
 287 +}
 288 +
 289  static void ieee80211_iface_work(struct work_struct *work)
 290  {
 291         struct ieee80211_sub_if_data *sdata =
 292 @@ -1176,6 +1226,9 @@ static void ieee80211_iface_work(struct
 293                                 break;
 294                         ieee80211_mesh_rx_queued_mgmt(sdata, skb);
 295                         break;
 296 +               case NL80211_IFTYPE_WDS:
 297 +                       ieee80211_wds_rx_queued_mgmt(sdata, skb);
 298 +                       break;
 299                 default:
 300                         WARN(1, "frame for unexpected interface type");
 301                         break;
 302 --- a/net/mac80211/rx.c
 303 +++ b/net/mac80211/rx.c
 304 @@ -378,9 +378,6 @@ ieee80211_rx_monitor(struct ieee80211_lo
 305          * the SKB because it has a bad FCS/PLCP checksum.
 306          */
 307
 308 -       /* room for the radiotap header based on driver features */
 309 -       needed_headroom = ieee80211_rx_radiotap_space(local, status);
 310 -
 311         if (local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS)
 312                 present_fcs_len = FCS_LEN;
 313
 314 @@ -399,6 +396,9 @@ ieee80211_rx_monitor(struct ieee80211_lo
 315                 return remove_monitor_info(local, origskb);
 316         }
 317
 318 +       /* room for the radiotap header based on driver features */
 319 +       needed_headroom = ieee80211_rx_radiotap_space(local, status);
 320 +
 321         if (should_drop_frame(origskb, present_fcs_len)) {
 322                 /* only need to expand headroom if necessary */
 323                 skb = origskb;
 324 @@ -2333,7 +2333,8 @@ ieee80211_rx_h_action(struct ieee80211_r
 325         if (len < IEEE80211_MIN_ACTION_SIZE)
 326                 return RX_DROP_UNUSABLE;
 327
 328 -       if (!rx->sta && mgmt->u.action.category != WLAN_CATEGORY_PUBLIC)
 329 +       if (!rx->sta && mgmt->u.action.category != WLAN_CATEGORY_PUBLIC &&
 330 +           mgmt->u.action.category != WLAN_CATEGORY_SELF_PROTECTED)
 331                 return RX_DROP_UNUSABLE;
 332
 333         if (!(status->rx_flags & IEEE80211_RX_RA_MATCH))
 334 @@ -2349,6 +2350,7 @@ ieee80211_rx_h_action(struct ieee80211_r
 335                     sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
 336                     sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
 337                     sdata->vif.type != NL80211_IFTYPE_AP &&
 338 +                   sdata->vif.type != NL80211_IFTYPE_WDS &&
 339                     sdata->vif.type != NL80211_IFTYPE_ADHOC)
 340                         break;
 341
 342 @@ -2625,14 +2627,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
 343
 344         if (!ieee80211_vif_is_mesh(&sdata->vif) &&
 345             sdata->vif.type != NL80211_IFTYPE_ADHOC &&
 346 -           sdata->vif.type != NL80211_IFTYPE_STATION)
 347 +           sdata->vif.type != NL80211_IFTYPE_STATION &&
 348 +           sdata->vif.type != NL80211_IFTYPE_WDS)
 349                 return RX_DROP_MONITOR;
 350
 351         switch (stype) {
 352         case cpu_to_le16(IEEE80211_STYPE_AUTH):
 353         case cpu_to_le16(IEEE80211_STYPE_BEACON):
 354         case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
 355 -               /* process for all: mesh, mlme, ibss */
 356 +               /* process for all: mesh, mlme, ibss, wds */
 357                 break;
 358         case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
 359         case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
 360 @@ -2957,10 +2960,16 @@ static int prepare_for_handlers(struct i
 361                 }
 362                 break;
 363         case NL80211_IFTYPE_WDS:
 364 -               if (bssid || !ieee80211_is_data(hdr->frame_control))
 365 -                       return 0;
 366                 if (!ether_addr_equal(sdata->u.wds.remote_addr, hdr->addr2))
 367                         return 0;
 368 +
 369 +               if (ieee80211_is_data(hdr->frame_control) ||
 370 +                   ieee80211_is_action(hdr->frame_control)) {
 371 +                       if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
 372 +                               return 0;
 373 +               } else if (!ieee80211_is_beacon(hdr->frame_control))
 374 +                       return 0;
 375 +
 376                 break;
 377         case NL80211_IFTYPE_P2P_DEVICE:
 378                 if (!ieee80211_is_public_action(hdr, skb->len) &&
 379 --- a/net/mac80211/sta_info.h
 380 +++ b/net/mac80211/sta_info.h
 381 @@ -32,7 +32,6 @@
 382   * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
 383   *     frames.
 384   * @WLAN_STA_WME: Station is a QoS-STA.
 385 - * @WLAN_STA_WDS: Station is one of our WDS peers.
 386   * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
 387   *     IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
 388   *     frame to this station is transmitted.
 389 @@ -64,7 +63,6 @@ enum ieee80211_sta_info_flags {
 390         WLAN_STA_AUTHORIZED,
 391         WLAN_STA_SHORT_PREAMBLE,
 392         WLAN_STA_WME,
 393 -       WLAN_STA_WDS,
 394         WLAN_STA_CLEAR_PS_FILT,
 395         WLAN_STA_MFP,
 396         WLAN_STA_BLOCK_BA,
 397 --- a/net/mac80211/status.c
 398 +++ b/net/mac80211/status.c
 399 @@ -502,7 +502,11 @@ void ieee80211_tx_status(struct ieee8021
 400                                        IEEE80211_BAR_CTRL_TID_INFO_MASK) >>
 401                                       IEEE80211_BAR_CTRL_TID_INFO_SHIFT;
 402
 403 -                               ieee80211_set_bar_pending(sta, tid, ssn);
 404 +                               if (local->hw.flags &
 405 +                                   IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL)
 406 +                                       ieee80211_stop_tx_ba_session(&sta->sta, tid);
 407 +                               else
 408 +                                       ieee80211_set_bar_pending(sta, tid, ssn);
 409                         }
 410                 }
 411
 412 --- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
 413 +++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
 414 @@ -534,98 +534,98 @@ static const u32 ar9300_2p2_baseband_cor
 415
 416  static const u32 ar9300Modes_high_power_tx_gain_table_2p2[][5] = {
 417         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
 418 -       {0x0000a2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
 419 -       {0x0000a2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
 420 -       {0x0000a2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
 421 +       {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
 422 +       {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
 423 +       {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
 424         {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
 425 -       {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
 426 -       {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 427 -       {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
 428 -       {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
 429 -       {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
 430 -       {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
 431 -       {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
 432 -       {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
 433 -       {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
 434 -       {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
 435 -       {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
 436 -       {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
 437 -       {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
 438 -       {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
 439 -       {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
 440 -       {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
 441 -       {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
 442 -       {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
 443 -       {0x0000a544, 0x52022470, 0x52022470, 0x3f001861, 0x3f001861},
 444 -       {0x0000a548, 0x55022490, 0x55022490, 0x43001a81, 0x43001a81},
 445 -       {0x0000a54c, 0x59022492, 0x59022492, 0x47001a83, 0x47001a83},
 446 -       {0x0000a550, 0x5d022692, 0x5d022692, 0x4a001c84, 0x4a001c84},
 447 -       {0x0000a554, 0x61022892, 0x61022892, 0x4e001ce3, 0x4e001ce3},
 448 -       {0x0000a558, 0x65024890, 0x65024890, 0x52001ce5, 0x52001ce5},
 449 -       {0x0000a55c, 0x69024892, 0x69024892, 0x56001ce9, 0x56001ce9},
 450 -       {0x0000a560, 0x6e024c92, 0x6e024c92, 0x5a001ceb, 0x5a001ceb},
 451 -       {0x0000a564, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
 452 -       {0x0000a568, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
 453 -       {0x0000a56c, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
 454 -       {0x0000a570, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
 455 -       {0x0000a574, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
 456 -       {0x0000a578, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
 457 -       {0x0000a57c, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
 458 -       {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
 459 -       {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
 460 -       {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
 461 -       {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
 462 -       {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
 463 -       {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
 464 -       {0x0000a598, 0x21802220, 0x21802220, 0x16800402, 0x16800402},
 465 -       {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
 466 -       {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
 467 -       {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
 468 -       {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
 469 -       {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
 470 -       {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
 471 -       {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
 472 -       {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
 473 -       {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
 474 -       {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
 475 -       {0x0000a5c4, 0x52822470, 0x52822470, 0x3f801861, 0x3f801861},
 476 -       {0x0000a5c8, 0x55822490, 0x55822490, 0x43801a81, 0x43801a81},
 477 -       {0x0000a5cc, 0x59822492, 0x59822492, 0x47801a83, 0x47801a83},
 478 -       {0x0000a5d0, 0x5d822692, 0x5d822692, 0x4a801c84, 0x4a801c84},
 479 -       {0x0000a5d4, 0x61822892, 0x61822892, 0x4e801ce3, 0x4e801ce3},
 480 -       {0x0000a5d8, 0x65824890, 0x65824890, 0x52801ce5, 0x52801ce5},
 481 -       {0x0000a5dc, 0x69824892, 0x69824892, 0x56801ce9, 0x56801ce9},
 482 -       {0x0000a5e0, 0x6e824c92, 0x6e824c92, 0x5a801ceb, 0x5a801ceb},
 483 -       {0x0000a5e4, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
 484 -       {0x0000a5e8, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
 485 -       {0x0000a5ec, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
 486 -       {0x0000a5f0, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
 487 -       {0x0000a5f4, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
 488 -       {0x0000a5f8, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
 489 -       {0x0000a5fc, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
 490 +       {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
 491 +       {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
 492 +       {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
 493 +       {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
 494 +       {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
 495 +       {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
 496 +       {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
 497 +       {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
 498 +       {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
 499 +       {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
 500 +       {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
 501 +       {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
 502 +       {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
 503 +       {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
 504 +       {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
 505 +       {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
 506 +       {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
 507 +       {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
 508 +       {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
 509 +       {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
 510 +       {0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
 511 +       {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
 512 +       {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
 513 +       {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
 514 +       {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
 515 +       {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
 516 +       {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 517 +       {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 518 +       {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 519 +       {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 520 +       {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 521 +       {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 522 +       {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
 523 +       {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
 524 +       {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
 525 +       {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
 526 +       {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
 527 +       {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
 528 +       {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
 529 +       {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
 530 +       {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
 531 +       {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
 532 +       {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
 533 +       {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
 534 +       {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
 535 +       {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
 536 +       {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
 537 +       {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
 538 +       {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
 539 +       {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
 540 +       {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
 541 +       {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
 542 +       {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
 543 +       {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
 544 +       {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
 545 +       {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
 546 +       {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
 547 +       {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
 548 +       {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 549 +       {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 550 +       {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 551 +       {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 552 +       {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 553 +       {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 554 +       {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
 555         {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 556         {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 557         {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 558         {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 559 -       {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 560 -       {0x0000a614, 0x02004000, 0x02004000, 0x01404000, 0x01404000},
 561 -       {0x0000a618, 0x02004801, 0x02004801, 0x01404501, 0x01404501},
 562 -       {0x0000a61c, 0x02808a02, 0x02808a02, 0x02008501, 0x02008501},
 563 -       {0x0000a620, 0x0380ce03, 0x0380ce03, 0x0280ca03, 0x0280ca03},
 564 -       {0x0000a624, 0x04411104, 0x04411104, 0x03010c04, 0x03010c04},
 565 -       {0x0000a628, 0x04411104, 0x04411104, 0x04014c04, 0x04014c04},
 566 -       {0x0000a62c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
 567 -       {0x0000a630, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
 568 -       {0x0000a634, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
 569 -       {0x0000a638, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
 570 -       {0x0000a63c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
 571 -       {0x0000b2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
 572 -       {0x0000b2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
 573 -       {0x0000b2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
 574 +       {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
 575 +       {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
 576 +       {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
 577 +       {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
 578 +       {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
 579 +       {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
 580 +       {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
 581 +       {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 582 +       {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 583 +       {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 584 +       {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 585 +       {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
 586 +       {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
 587 +       {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
 588 +       {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
 589         {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
 590 -       {0x0000c2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
 591 -       {0x0000c2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
 592 -       {0x0000c2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
 593 +       {0x0000c2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
 594 +       {0x0000c2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
 595 +       {0x0000c2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
 596         {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
 597         {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
 598         {0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
 599 --- a/drivers/net/wireless/ath/ath9k/debug.h
 600 +++ b/drivers/net/wireless/ath/ath9k/debug.h
 601 @@ -242,7 +242,7 @@ struct ath_rx_stats {
 602
 603  struct ath_stats {
 604         struct ath_interrupt_stats istats;
 605 -       struct ath_tx_stats txstats[IEEE80211_NUM_ACS];
 606 +       struct ath_tx_stats txstats[ATH9K_NUM_TX_QUEUES];
 607         struct ath_rx_stats rxstats;
 608         struct ath_dfs_stats dfs_stats;
 609         u32 reset[__RESET_TYPE_MAX];
 610 --- a/drivers/net/wireless/ath/carl9170/rx.c
 611 +++ b/drivers/net/wireless/ath/carl9170/rx.c
 612 @@ -684,7 +684,7 @@ static int carl9170_handle_mpdu(struct a
 613         if (!skb)
 614                 return -ENOMEM;
 615
 616 -       memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
 617 +       memcpy(IEEE80211_SKB_RXCB(skb), status, sizeof(*status));
 618         ieee80211_rx(ar->hw, skb);
 619         return 0;
 620  }
 621 --- a/drivers/net/wireless/ath/ath9k/calib.c
 622 +++ b/drivers/net/wireless/ath/ath9k/calib.c
 623 @@ -69,6 +69,7 @@ s16 ath9k_hw_getchan_noise(struct ath_hw
 624
 625         if (chan && chan->noisefloor) {
 626                 s8 delta = chan->noisefloor -
 627 +                          ATH9K_NF_CAL_NOISE_THRESH -
 628                            ath9k_hw_get_default_nf(ah, chan);
 629                 if (delta > 0)
 630                         noise += delta;
 631 --- a/drivers/net/wireless/ath/ath9k/calib.h
 632 +++ b/drivers/net/wireless/ath/ath9k/calib.h
 633 @@ -21,6 +21,9 @@
 634
 635  #define AR_PHY_CCA_FILTERWINDOW_LENGTH          5
 636
 637 +/* Internal noise floor can vary by about 6db depending on the frequency */
 638 +#define ATH9K_NF_CAL_NOISE_THRESH              6
 639 +
 640  #define NUM_NF_READINGS       6
 641  #define ATH9K_NF_CAL_HIST_MAX 5
 642
 643 --- a/drivers/net/wireless/ath/ath5k/base.c
 644 +++ b/drivers/net/wireless/ath/ath5k/base.c
 645 @@ -851,7 +851,7 @@ ath5k_txbuf_free_skb(struct ath5k_hw *ah
 646                 return;
 647         dma_unmap_single(ah->dev, bf->skbaddr, bf->skb->len,
 648                         DMA_TO_DEVICE);
 649 -       dev_kfree_skb_any(bf->skb);
 650 +       ieee80211_free_txskb(ah->hw, bf->skb);
 651         bf->skb = NULL;
 652         bf->skbaddr = 0;
 653         bf->desc->ds_data = 0;
 654 @@ -1578,7 +1578,7 @@ ath5k_tx_queue(struct ieee80211_hw *hw,
 655         return;
 656
 657  drop_packet:
 658 -       dev_kfree_skb_any(skb);
 659 +       ieee80211_free_txskb(hw, skb);
 660  }
 661
 662  static void
 663 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
 664 +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
 665 @@ -65,7 +65,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct
 666         u16 qnum = skb_get_queue_mapping(skb);
 667
 668         if (WARN_ON(qnum >= ah->ah_capabilities.cap_queues.q_tx_num)) {
 669 -               dev_kfree_skb_any(skb);
 670 +               ieee80211_free_txskb(hw, skb);
 671                 return;
 672         }
 673
 674 --- a/drivers/net/wireless/b43/dma.c
 675 +++ b/drivers/net/wireless/b43/dma.c
 676 @@ -409,7 +409,10 @@ static inline
 677                                 struct b43_dmadesc_meta *meta)
 678  {
 679         if (meta->skb) {
 680 -               dev_kfree_skb_any(meta->skb);
 681 +               if (ring->tx)
 682 +                       ieee80211_free_txskb(ring->dev->wl->hw, meta->skb);
 683 +               else
 684 +                       dev_kfree_skb_any(meta->skb);
 685                 meta->skb = NULL;
 686         }
 687  }
 688 @@ -1454,7 +1457,7 @@ int b43_dma_tx(struct b43_wldev *dev, st
 689         if (unlikely(err == -ENOKEY)) {
 690                 /* Drop this packet, as we don't have the encryption key
 691                  * anymore and must not transmit it unencrypted. */
 692 -               dev_kfree_skb_any(skb);
 693 +               ieee80211_free_txskb(dev->wl->hw, skb);
 694                 err = 0;
 695                 goto out;
 696         }
 697 --- a/drivers/net/wireless/b43/main.c
 698 +++ b/drivers/net/wireless/b43/main.c
 699 @@ -3397,7 +3397,7 @@ static void b43_tx_work(struct work_stru
 700                                 break;
 701                         }
 702                         if (unlikely(err))
 703 -                               dev_kfree_skb(skb); /* Drop it */
 704 +                               ieee80211_free_txskb(wl->hw, skb);
 705                         err = 0;
 706                 }
 707
 708 @@ -3419,7 +3419,7 @@ static void b43_op_tx(struct ieee80211_h
 709
 710         if (unlikely(skb->len < 2 + 2 + 6)) {
 711                 /* Too short, this can't be a valid frame. */
 712 -               dev_kfree_skb_any(skb);
 713 +               ieee80211_free_txskb(hw, skb);
 714                 return;
 715         }
 716         B43_WARN_ON(skb_shinfo(skb)->nr_frags);
 717 @@ -4234,8 +4234,12 @@ redo:
 718
 719         /* Drain all TX queues. */
 720         for (queue_num = 0; queue_num < B43_QOS_QUEUE_NUM; queue_num++) {
 721 -               while (skb_queue_len(&wl->tx_queue[queue_num]))
 722 -                       dev_kfree_skb(skb_dequeue(&wl->tx_queue[queue_num]));
 723 +               while (skb_queue_len(&wl->tx_queue[queue_num])) {
 724 +                       struct sk_buff *skb;
 725 +
 726 +                       skb = skb_dequeue(&wl->tx_queue[queue_num]);
 727 +                       ieee80211_free_txskb(wl->hw, skb);
 728 +               }
 729         }
 730
 731         b43_mac_suspend(dev);
 732 --- a/drivers/net/wireless/b43/pio.c
 733 +++ b/drivers/net/wireless/b43/pio.c
 734 @@ -196,7 +196,7 @@ static void b43_pio_cancel_tx_packets(st
 735         for (i = 0; i < ARRAY_SIZE(q->packets); i++) {
 736                 pack = &(q->packets[i]);
 737                 if (pack->skb) {
 738 -                       dev_kfree_skb_any(pack->skb);
 739 +                       ieee80211_free_txskb(q->dev->wl->hw, pack->skb);
 740                         pack->skb = NULL;
 741                 }
 742         }
 743 @@ -552,7 +552,7 @@ int b43_pio_tx(struct b43_wldev *dev, st
 744         if (unlikely(err == -ENOKEY)) {
 745                 /* Drop this packet, as we don't have the encryption key
 746                  * anymore and must not transmit it unencrypted. */
 747 -               dev_kfree_skb_any(skb);
 748 +               ieee80211_free_txskb(dev->wl->hw, skb);
 749                 err = 0;
 750                 goto out;
 751         }
 752 --- a/net/mac80211/cfg.c
 753 +++ b/net/mac80211/cfg.c
 754 @@ -915,6 +915,12 @@ static int ieee80211_start_ap(struct wip
 755         if (err)
 756                 return err;
 757
 758 +       list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) {
 759 +               err = ieee80211_vif_copy_channel(vlan, sdata);
 760 +               if (err)
 761 +                       return err;
 762 +       }
 763 +
 764         /*
 765          * Apply control port protocol, this allows us to
 766          * not encrypt dynamic WEP control frames.
 767 @@ -998,8 +1004,11 @@ static int ieee80211_stop_ap(struct wiph
 768         old_probe_resp = rtnl_dereference(sdata->u.ap.probe_resp);
 769
 770         /* turn off carrier for this interface and dependent VLANs */
 771 -       list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
 772 +       list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) {
 773 +               sta_info_flush(local, vlan);
 774                 netif_carrier_off(vlan->dev);
 775 +               ieee80211_vif_release_channel(vlan);
 776 +       }
 777         netif_carrier_off(dev);
 778
 779         /* remove beacon and probe response */
 780 --- a/net/mac80211/chan.c
 781 +++ b/net/mac80211/chan.c
 782 @@ -119,14 +119,17 @@ static int ieee80211_assign_vif_chanctx(
 783
 784         lockdep_assert_held(&local->chanctx_mtx);
 785
 786 -       ret = drv_assign_vif_chanctx(local, sdata, ctx);
 787 -       if (ret)
 788 -               return ret;
 789 +       if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN) {
 790 +               ret = drv_assign_vif_chanctx(local, sdata, ctx);
 791 +               if (ret)
 792 +                       return ret;
 793 +       }
 794
 795         rcu_assign_pointer(sdata->vif.chanctx_conf, &ctx->conf);
 796         ctx->refcount++;
 797
 798 -       ieee80211_recalc_txpower(sdata);
 799 +       if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN)
 800 +               ieee80211_recalc_txpower(sdata);
 801
 802         return 0;
 803  }
 804 @@ -174,7 +177,8 @@ static void ieee80211_unassign_vif_chanc
 805         ctx->refcount--;
 806         rcu_assign_pointer(sdata->vif.chanctx_conf, NULL);
 807
 808 -       drv_unassign_vif_chanctx(local, sdata, ctx);
 809 +       if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN)
 810 +               drv_unassign_vif_chanctx(local, sdata, ctx);
 811
 812         if (ctx->refcount > 0) {
 813                 ieee80211_recalc_chanctx_chantype(sdata->local, ctx);
 814 @@ -285,6 +289,30 @@ void ieee80211_recalc_smps_chanctx(struc
 815         drv_change_chanctx(local, chanctx, IEEE80211_CHANCTX_CHANGE_RX_CHAINS);
 816  }
 817
 818 +int ieee80211_vif_copy_channel(struct ieee80211_sub_if_data *sdata,
 819 +                              struct ieee80211_sub_if_data *parent)
 820 +{
 821 +       struct ieee80211_local *local = sdata->local;
 822 +       struct ieee80211_chanctx_conf *conf;
 823 +       struct ieee80211_chanctx *ctx;
 824 +
 825 +       int ret;
 826 +
 827 +       mutex_lock(&local->chanctx_mtx);
 828 +       conf = rcu_dereference_protected(parent->vif.chanctx_conf,
 829 +                                        lockdep_is_held(&local->chanctx_mtx));
 830 +       if (!conf) {
 831 +               ret = -ENOENT;
 832 +               goto out;
 833 +       }
 834 +
 835 +       ctx = container_of(conf, struct ieee80211_chanctx, conf);
 836 +       ret = ieee80211_assign_vif_chanctx(sdata, ctx);
 837 +out:
 838 +       mutex_unlock(&local->chanctx_mtx);
 839 +       return ret;
 840 +}
 841 +
 842  int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata,
 843                               const struct cfg80211_chan_def *chandef,
 844                               enum ieee80211_chanctx_mode mode)
 845 --- a/net/mac80211/ieee80211_i.h
 846 +++ b/net/mac80211/ieee80211_i.h
 847 @@ -1633,6 +1633,8 @@ ieee80211_vif_use_channel(struct ieee802
 848                           const struct cfg80211_chan_def *chandef,
 849                           enum ieee80211_chanctx_mode mode);
 850  void ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata);
 851 +int ieee80211_vif_copy_channel(struct ieee80211_sub_if_data *sdata,
 852 +                              struct ieee80211_sub_if_data *parent);
 853
 854  void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,
 855                                    struct ieee80211_chanctx *chanctx);
 856 --- a/include/linux/ieee80211.h
 857 +++ b/include/linux/ieee80211.h
 858 @@ -180,7 +180,7 @@ struct ieee80211_hdr {
 859         u8 addr3[6];
 860         __le16 seq_ctrl;
 861         u8 addr4[6];
 862 -} __attribute__ ((packed));
 863 +} __packed;
 864
 865  struct ieee80211_hdr_3addr {
 866         __le16 frame_control;
 867 @@ -189,7 +189,7 @@ struct ieee80211_hdr_3addr {
 868         u8 addr2[6];
 869         u8 addr3[6];
 870         __le16 seq_ctrl;
 871 -} __attribute__ ((packed));
 872 +} __packed;
 873
 874  struct ieee80211_qos_hdr {
 875         __le16 frame_control;
 876 @@ -199,7 +199,7 @@ struct ieee80211_qos_hdr {
 877         u8 addr3[6];
 878         __le16 seq_ctrl;
 879         __le16 qos_ctrl;
 880 -} __attribute__ ((packed));
 881 +} __packed;
 882
 883  /**
 884   * ieee80211_has_tods - check if IEEE80211_FCTL_TODS is set
 885 @@ -576,7 +576,7 @@ struct ieee80211s_hdr {
 886         __le32 seqnum;
 887         u8 eaddr1[6];
 888         u8 eaddr2[6];
 889 -} __attribute__ ((packed));
 890 +} __packed;
 891
 892  /* Mesh flags */
 893  #define MESH_FLAGS_AE_A4       0x1
 894 @@ -614,7 +614,7 @@ struct ieee80211_quiet_ie {
 895         u8 period;
 896         __le16 duration;
 897         __le16 offset;
 898 -} __attribute__ ((packed));
 899 +} __packed;
 900
 901  /**
 902   * struct ieee80211_msrment_ie
 903 @@ -626,7 +626,7 @@ struct ieee80211_msrment_ie {
 904         u8 mode;
 905         u8 type;
 906         u8 request[0];
 907 -} __attribute__ ((packed));
 908 +} __packed;
 909
 910  /**
 911   * struct ieee80211_channel_sw_ie
 912 @@ -637,7 +637,7 @@ struct ieee80211_channel_sw_ie {
 913         u8 mode;
 914         u8 new_ch_num;
 915         u8 count;
 916 -} __attribute__ ((packed));
 917 +} __packed;
 918
 919  /**
 920   * struct ieee80211_tim
 921 @@ -650,7 +650,7 @@ struct ieee80211_tim_ie {
 922         u8 bitmap_ctrl;
 923         /* variable size: 1 - 251 bytes */
 924         u8 virtual_map[1];
 925 -} __attribute__ ((packed));
 926 +} __packed;
 927
 928  /**
 929   * struct ieee80211_meshconf_ie
 930 @@ -665,7 +665,7 @@ struct ieee80211_meshconf_ie {
 931         u8 meshconf_auth;
 932         u8 meshconf_form;
 933         u8 meshconf_cap;
 934 -} __attribute__ ((packed));
 935 +} __packed;
 936
 937  /**
 938   * enum mesh_config_capab_flags - Mesh Configuration IE capability field flags
 939 @@ -695,7 +695,7 @@ struct ieee80211_rann_ie {
 940         __le32 rann_seq;
 941         __le32 rann_interval;
 942         __le32 rann_metric;
 943 -} __attribute__ ((packed));
 944 +} __packed;
 945
 946  enum ieee80211_rann_flags {
 947         RANN_FLAG_IS_GATE = 1 << 0,
 948 @@ -717,33 +717,33 @@ struct ieee80211_mgmt {
 949                         __le16 status_code;
 950                         /* possibly followed by Challenge text */
 951                         u8 variable[0];
 952 -               } __attribute__ ((packed)) auth;
 953 +               } __packed auth;
 954                 struct {
 955                         __le16 reason_code;
 956 -               } __attribute__ ((packed)) deauth;
 957 +               } __packed deauth;
 958                 struct {
 959                         __le16 capab_info;
 960                         __le16 listen_interval;
 961                         /* followed by SSID and Supported rates */
 962                         u8 variable[0];
 963 -               } __attribute__ ((packed)) assoc_req;
 964 +               } __packed assoc_req;
 965                 struct {
 966                         __le16 capab_info;
 967                         __le16 status_code;
 968                         __le16 aid;
 969                         /* followed by Supported rates */
 970                         u8 variable[0];
 971 -               } __attribute__ ((packed)) assoc_resp, reassoc_resp;
 972 +               } __packed assoc_resp, reassoc_resp;
 973                 struct {
 974                         __le16 capab_info;
 975                         __le16 listen_interval;
 976                         u8 current_ap[6];
 977                         /* followed by SSID and Supported rates */
 978                         u8 variable[0];
 979 -               } __attribute__ ((packed)) reassoc_req;
 980 +               } __packed reassoc_req;
 981                 struct {
 982                         __le16 reason_code;
 983 -               } __attribute__ ((packed)) disassoc;
 984 +               } __packed disassoc;
 985                 struct {
 986                         __le64 timestamp;
 987                         __le16 beacon_int;
 988 @@ -751,11 +751,11 @@ struct ieee80211_mgmt {
 989                         /* followed by some of SSID, Supported rates,
 990                          * FH Params, DS Params, CF Params, IBSS Params, TIM */
 991                         u8 variable[0];
 992 -               } __attribute__ ((packed)) beacon;
 993 +               } __packed beacon;
 994                 struct {
 995                         /* only variable items: SSID, Supported rates */
 996                         u8 variable[0];
 997 -               } __attribute__ ((packed)) probe_req;
 998 +               } __packed probe_req;
 999                 struct {
1000                         __le64 timestamp;
1001                         __le16 beacon_int;
1002 @@ -763,7 +763,7 @@ struct ieee80211_mgmt {
1003                         /* followed by some of SSID, Supported rates,
1004                          * FH Params, DS Params, CF Params, IBSS Params */
1005                         u8 variable[0];
1006 -               } __attribute__ ((packed)) probe_resp;
1007 +               } __packed probe_resp;
1008                 struct {
1009                         u8 category;
1010                         union {
1011 @@ -772,55 +772,55 @@ struct ieee80211_mgmt {
1012                                         u8 dialog_token;
1013                                         u8 status_code;
1014                                         u8 variable[0];
1015 -                               } __attribute__ ((packed)) wme_action;
1016 +                               } __packed wme_action;
1017                                 struct{
1018                                         u8 action_code;
1019                                         u8 element_id;
1020                                         u8 length;
1021                                         struct ieee80211_channel_sw_ie sw_elem;
1022 -                               } __attribute__((packed)) chan_switch;
1023 +                               } __packed chan_switch;
1024                                 struct{
1025                                         u8 action_code;
1026                                         u8 dialog_token;
1027                                         u8 element_id;
1028                                         u8 length;
1029                                         struct ieee80211_msrment_ie msr_elem;
1030 -                               } __attribute__((packed)) measurement;
1031 +                               } __packed measurement;
1032                                 struct{
1033                                         u8 action_code;
1034                                         u8 dialog_token;
1035                                         __le16 capab;
1036                                         __le16 timeout;
1037                                         __le16 start_seq_num;
1038 -                               } __attribute__((packed)) addba_req;
1039 +                               } __packed addba_req;
1040                                 struct{
1041                                         u8 action_code;
1042                                         u8 dialog_token;
1043                                         __le16 status;
1044                                         __le16 capab;
1045                                         __le16 timeout;
1046 -                               } __attribute__((packed)) addba_resp;
1047 +                               } __packed addba_resp;
1048                                 struct{
1049                                         u8 action_code;
1050                                         __le16 params;
1051                                         __le16 reason_code;
1052 -                               } __attribute__((packed)) delba;
1053 +                               } __packed delba;
1054                                 struct {
1055                                         u8 action_code;
1056                                         u8 variable[0];
1057 -                               } __attribute__((packed)) self_prot;
1058 +                               } __packed self_prot;
1059                                 struct{
1060                                         u8 action_code;
1061                                         u8 variable[0];
1062 -                               } __attribute__((packed)) mesh_action;
1063 +                               } __packed mesh_action;
1064                                 struct {
1065                                         u8 action;
1066                                         u8 trans_id[WLAN_SA_QUERY_TR_ID_LEN];
1067 -                               } __attribute__ ((packed)) sa_query;
1068 +                               } __packed sa_query;
1069                                 struct {
1070                                         u8 action;
1071                                         u8 smps_control;
1072 -                               } __attribute__ ((packed)) ht_smps;
1073 +                               } __packed ht_smps;
1074                                 struct {
1075                                         u8 action_code;
1076                                         u8 dialog_token;
1077 @@ -828,9 +828,9 @@ struct ieee80211_mgmt {
1078                                         u8 variable[0];
1079                                 } __packed tdls_discover_resp;
1080                         } u;
1081 -               } __attribute__ ((packed)) action;
1082 +               } __packed action;
1083         } u;
1084 -} __attribute__ ((packed));
1085 +} __packed;
1086
1087  /* Supported Rates value encodings in 802.11n-2009 7.3.2.2 */
1088  #define BSS_MEMBERSHIP_SELECTOR_HT_PHY 127
1089 @@ -846,7 +846,7 @@ struct ieee80211_mmie {
1090         __le16 key_id;
1091         u8 sequence_number[6];
1092         u8 mic[8];
1093 -} __attribute__ ((packed));
1094 +} __packed;
1095
1096  struct ieee80211_vendor_ie {
1097         u8 element_id;
1098 @@ -861,20 +861,20 @@ struct ieee80211_rts {
1099         __le16 duration;
1100         u8 ra[6];
1101         u8 ta[6];
1102 -} __attribute__ ((packed));
1103 +} __packed;
1104
1105  struct ieee80211_cts {
1106         __le16 frame_control;
1107         __le16 duration;
1108         u8 ra[6];
1109 -} __attribute__ ((packed));
1110 +} __packed;
1111
1112  struct ieee80211_pspoll {
1113         __le16 frame_control;
1114         __le16 aid;
1115         u8 bssid[6];
1116         u8 ta[6];
1117 -} __attribute__ ((packed));
1118 +} __packed;
1119
1120  /* TDLS */
1121
1122 @@ -967,7 +967,7 @@ struct ieee80211_bar {
1123         __u8 ta[6];
1124         __le16 control;
1125         __le16 start_seq_num;
1126 -} __attribute__((packed));
1127 +} __packed;
1128
1129  /* 802.11 BAR control masks */
1130  #define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL   0x0000
1131 @@ -992,7 +992,7 @@ struct ieee80211_mcs_info {
1132         __le16 rx_highest;
1133         u8 tx_params;
1134         u8 reserved[3];
1135 -} __attribute__((packed));
1136 +} __packed;
1137
1138  /* 802.11n HT capability MSC set */
1139  #define IEEE80211_HT_MCS_RX_HIGHEST_MASK       0x3ff
1140 @@ -1031,7 +1031,7 @@ struct ieee80211_ht_cap {
1141         __le16 extended_ht_cap_info;
1142         __le32 tx_BF_cap_info;
1143         u8 antenna_selection_info;
1144 -} __attribute__ ((packed));
1145 +} __packed;
1146
1147  /* 802.11n HT capabilities masks (for cap_info) */
1148  #define IEEE80211_HT_CAP_LDPC_CODING           0x0001
1149 @@ -1102,7 +1102,7 @@ struct ieee80211_ht_operation {
1150         __le16 operation_mode;
1151         __le16 stbc_param;
1152         u8 basic_set[16];
1153 -} __attribute__ ((packed));
1154 +} __packed;
1155
1156  /* for ht_param */
1157  #define IEEE80211_HT_PARAM_CHA_SEC_OFFSET              0x03
1158 @@ -1832,14 +1832,14 @@ struct ieee80211_country_ie_triplet {
1159                         u8 first_channel;
1160                         u8 num_channels;
1161                         s8 max_power;
1162 -               } __attribute__ ((packed)) chans;
1163 +               } __packed chans;
1164                 struct {
1165                         u8 reg_extension_id;
1166                         u8 reg_class;
1167                         u8 coverage_class;
1168 -               } __attribute__ ((packed)) ext;
1169 +               } __packed ext;
1170         };
1171 -} __attribute__ ((packed));
1172 +} __packed;
1173
1174  enum ieee80211_timeout_interval_type {
1175         WLAN_TIMEOUT_REASSOC_DEADLINE = 1 /* 802.11r */,
1176 --- a/include/net/cfg80211.h
1177 +++ b/include/net/cfg80211.h
1178 @@ -1256,7 +1256,7 @@ struct cfg80211_bss {
1179
1180         u8 bssid[ETH_ALEN];
1181
1182 -       u8 priv[0] __attribute__((__aligned__(sizeof(void *))));
1183 +       u8 priv[0] __aligned(sizeof(void *));
1184  };
1185
1186  /**
1187 @@ -2395,7 +2395,7 @@ struct wiphy {
1188         const struct iw_handler_def *wext;
1189  #endif
1190
1191 -       char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
1192 +       char priv[0] __aligned(NETDEV_ALIGN);
1193  };
1194
1195  static inline struct net *wiphy_net(struct wiphy *wiphy)
1196 --- a/net/wireless/core.h
1197 +++ b/net/wireless/core.h
1198 @@ -86,7 +86,7 @@ struct cfg80211_registered_device {
1199
1200         /* must be last because of the way we do wiphy_priv(),
1201          * and it should at least be aligned to NETDEV_ALIGN */
1202 -       struct wiphy wiphy __attribute__((__aligned__(NETDEV_ALIGN)));
1203 +       struct wiphy wiphy __aligned(NETDEV_ALIGN);
1204  };
1205
1206  static inline