package/kernel/mac80211/patches/300-pending_work.patch

   1 commit 92e9dd662542683856e62a5e7e43fcf5b9da5c4a
   2 Author: Henning Rogge <hrogge@gmail.com>
   3 Date:   Thu May 1 10:03:46 2014 +0200
   4
   5     mac80211: Fix mac80211 station info rx bitrate for IBSS mode
   6
   7     Filter out incoming multicast packages before applying their bitrate
   8     to the rx bitrate station info field to prevent them from setting the
   9     rx bitrate to the basic multicast rate.
  10
  11     Signed-off-by: Henning Rogge <hrogge@gmail.com>
  12
  13 commit 4c8a3486cb577d40c1ef75f0a8dc9a04773eef83
  14 Author: Nickolay Ledovskikh <nledovskikh@gmail.com>
  15 Date:   Fri Apr 25 22:53:34 2014 +0400
  16
  17     ath5k: Fix AR5K_PHY_TXPOWER_RATE_MAX register value setting.
  18
  19     I was reading ath5k power setting code and
  20     noticed typing error in ath5k_hw_txpower function.
  21     Invalid value was written to AR5K_PHY_TXPOWER_RATE_MAX
  22     register.
  23
  24     Signed-off-by: Nikolay Ledovskikh <nledovskikh@gmail.com>
  25     Acked-by: Nick Kossifidis <mickflemm@gmail.com>
  26     Signed-off-by: John W. Linville <linville@tuxdriver.com>
  27
  28 commit 4d76248013dbb1948429555208900a585b0f351d
  29 Author: Janusz Dziedzic <janusz.dziedzic@tieto.com>
  30 Date:   Tue Apr 8 13:38:43 2014 +0200
  31
  32     ath9k: Enable DFS only when ATH9K_DFS_CERTIFIED
  33
  34     Add DFS interface combination only when
  35     CONFIG_ATH9K_DFS_CERTIFIED is set. In other case
  36     user can run CAC/beaconing without proper handling
  37     of pulse events (without radar detection activated).
  38
  39     Reported-by: Cedric Voncken <cedric.voncken@acksys.fr>
  40     Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
  41     Signed-off-by: John W. Linville <linville@tuxdriver.com>
  42
  43 commit c83a4e5156a4b4dd22137d33a5625440982d6d37
  44 Author: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
  45 Date:   Mon Apr 28 21:17:08 2014 +0530
  46
  47     ath9k_hw: fix worse EVM for 11b rates
  48
  49     Adjust FIR filter co-efficients to improve EVM for 11b rates.
  50
  51     Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
  52     Signed-off-by: John W. Linville <linville@tuxdriver.com>
  53
  54 commit 8aab2c7a2f4a957e344db429dfb1190ae59ce8b5
  55 Author: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
  56 Date:   Mon Apr 28 21:17:07 2014 +0530
  57
  58     ath9k_hw: update ar9300 initvals
  59
  60      * rfsat gainchange hysteresis of rf_gain stuck with large
  61        interference present.
  62
  63     Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
  64     Signed-off-by: John W. Linville <linville@tuxdriver.com>
  65
  66 commit 8c7ae357cc5b6bd037ad2d666e9f3789cf882925
  67 Author: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
  68 Date:   Wed Apr 23 15:07:57 2014 +0530
  69
  70     ath9k: fix race in setting ATH_OP_INVALID
  71
  72     The commit "ath9k: move sc_flags to ath_common" moved setting
  73     ATH_OP_INVALID flag below ieee80211_register_hw. This is causing
  74     the flag never being cleared randomly as the drv_start is called
  75     prior to setting flag. Fix this by setting the flag prior to
  76     register_hw.
  77
  78     Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
  79     Signed-off-by: John W. Linville <linville@tuxdriver.com>
  80
  81 commit c82552c5b0cb1735dbcbad78b1ffc6d3c212dc56
  82 Author: Tim Harvey <tharvey@gateworks.com>
  83 Date:   Mon Apr 21 16:14:57 2014 -0700
  84
  85     ath9k: add a recv budget
  86
  87     Implement a recv budget so that in cases of high traffic we still allow other
  88     taskets to get processed.
  89
  90     Without this, we can encounter a host of issues during high wireless traffic
  91     reception depending on system load including rcu stall's detected (ARM),
  92     soft lockups, failure to service critical tasks such as watchdog resets,
  93     and triggering of the tx stuck tasklet.
  94
  95     The same thing was proposed previously by Ben:
  96      http://www.spinics.net/lists/linux-wireless/msg112891.html
  97
  98     The only difference here is that I make sure only processed packets are counted
  99     in the budget by checking at the end of the rx loop.
 100
 101     Signed-off-by: Tim Harvey <tharvey@gateworks.com>
 102     Acked-by: Felix Fietkau <nbd@openwrt.org>
 103     Signed-off-by: John W. Linville <linville@tuxdriver.com>
 104
 105 commit 3a758134e66ca74a9df792616b5288b2fa2cfd7f
 106 Author: Tim Harvey <tharvey@gateworks.com>
 107 Date:   Mon Apr 21 16:14:56 2014 -0700
 108
 109     ath9k: fix possible hang on flush
 110
 111     If a flush is requested, make sure to clear the descriptor once we've
 112     processed it.
 113
 114     This resolves a hang that will occur if all RX descriptors are full when a
 115     flush is requested.
 116
 117     Signed-off-by: Tim Harvey <tharvey@gateworks.com>
 118     Acked-by: Felix Fietkau <nbd@openwrt.org>
 119     Signed-off-by: John W. Linville <linville@tuxdriver.com>
 120
 121 commit eefb1d6adc4c60d219182b8917e4567484ce07fc
 122 Author: Felix Fietkau <nbd@openwrt.org>
 123 Date:   Mon Apr 28 18:27:41 2014 +0200
 124
 125     ath9k: remove tid->paused flag
 126
 127     There are some corner cases where the driver could get stuck with a full
 128     tid queue that is paused, leading to a software tx queue hang.
 129
 130     Since the tx queueing rework, pausing per-tid queues on aggregation
 131     session setup is no longer necessary. The driver will assign sequence
 132     numbers to buffered frames when a new session is established, in order
 133     to get the correct starting sequence number.
 134
 135     mac80211 prevents new frames from entering the queue during setup.
 136
 137     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 138
 139 commit 98a713933d8495f4078f561c1e651b738dd5b531
 140 Author: Felix Fietkau <nbd@openwrt.org>
 141 Date:   Sun Apr 27 14:49:03 2014 +0200
 142
 143     ath9k_hw: do not lower ANI setting below default on AR913x
 144
 145     When the amount of noise fluctuates strongly, low immunity settings
 146     can sometimes disrupt signal detection on AR913x chips. When that
 147     happens, no OFDM/CCK errors are reported anymore, and ANI tunes the
 148     radio to the lowest immunity settings.
 149     Usually rx/tx fails as well in that case.
 150
 151     To fix this, keep noise immunity settings at or above ANI default level,
 152     which will keep radio parameters at or above INI values.
 153
 154     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 155
 156 commit 7cbb4c021bfd1e656f5b9953a947ab3c64e4e3b0
 157 Author: Felix Fietkau <nbd@openwrt.org>
 158 Date:   Thu Apr 10 10:49:01 2014 +0200
 159
 160     mac80211: exclude AP_VLAN interfaces from tx power calculation
 161
 162     Their power value is initialized to zero. This patch fixes an issue
 163     where the configured power drops to the minimum value when AP_VLAN
 164     interfaces are created/removed.
 165
 166     Cc: stable@vger.kernel.org
 167     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 168
 169 commit 0ca13e26341733bf9577287fb04a3bef0d2f5cc9
 170 Author: Felix Fietkau <nbd@openwrt.org>
 171 Date:   Wed Apr 9 00:07:01 2014 +0200
 172
 173     mac80211: suppress BSS info change notifications for AP_VLAN
 174
 175     Fixes warnings on tx power changes
 176
 177     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 178
 179 commit ec998e5991781ecdaad0911dc64f1c8d3749c308
 180 Author: Felix Fietkau <nbd@openwrt.org>
 181 Date:   Tue Apr 8 23:42:17 2014 +0200
 182
 183     ath9k: fix a scheduling while atomic bug in CSA handling
 184
 185     Commit "ath9k: prepare for multi-interface CSA support" added a call to
 186     ieee80211_iterate_active_interfaces in atomic context (beacon tasklet),
 187     which is crashing.
 188     Use ieee80211_iterate_active_interfaces_atomic instead.
 189
 190     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 191
 192 commit 93f310a38a1d81a4bc8fcd9bf29628bd721cf2ef
 193 Author: Felix Fietkau <nbd@openwrt.org>
 194 Date:   Sun Apr 6 23:35:28 2014 +0200
 195
 196     ath9k_hw: reduce ANI firstep range for older chips
 197
 198     Use 0-8 instead of 0-16, which is closer to the old implementation.
 199     Also drop the overwrite of the firstep_low parameter to improve
 200     stability.
 201
 202     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 203
 204
 205 --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
 206 +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
 207 @@ -1004,11 +1004,9 @@ static bool ar5008_hw_ani_control_new(st
 208         case ATH9K_ANI_FIRSTEP_LEVEL:{
 209                 u32 level = param;
 210
 211 -               value = level * 2;
 212 +               value = level;
 213                 REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
 214                               AR_PHY_FIND_SIG_FIRSTEP, value);
 215 -               REG_RMW_FIELD(ah, AR_PHY_FIND_SIG_LOW,
 216 -                             AR_PHY_FIND_SIG_FIRSTEP_LOW, value);
 217
 218                 if (level != aniState->firstepLevel) {
 219                         ath_dbg(common, ANI,
 220 --- a/drivers/net/wireless/ath/ath9k/beacon.c
 221 +++ b/drivers/net/wireless/ath/ath9k/beacon.c
 222 @@ -312,10 +312,9 @@ static void ath9k_csa_update_vif(void *d
 223
 224  void ath9k_csa_update(struct ath_softc *sc)
 225  {
 226 -       ieee80211_iterate_active_interfaces(sc->hw,
 227 -                                           IEEE80211_IFACE_ITER_NORMAL,
 228 -                                           ath9k_csa_update_vif,
 229 -                                           sc);
 230 +       ieee80211_iterate_active_interfaces_atomic(sc->hw,
 231 +                                                  IEEE80211_IFACE_ITER_NORMAL,
 232 +                                                  ath9k_csa_update_vif, sc);
 233  }
 234
 235  void ath9k_beacon_tasklet(unsigned long data)
 236 --- a/net/mac80211/main.c
 237 +++ b/net/mac80211/main.c
 238 @@ -152,6 +152,8 @@ static u32 ieee80211_hw_conf_chan(struct
 239         list_for_each_entry_rcu(sdata, &local->interfaces, list) {
 240                 if (!rcu_access_pointer(sdata->vif.chanctx_conf))
 241                         continue;
 242 +               if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
 243 +                       continue;
 244                 power = min(power, sdata->vif.bss_conf.txpower);
 245         }
 246         rcu_read_unlock();
 247 @@ -203,7 +205,7 @@ void ieee80211_bss_info_change_notify(st
 248  {
 249         struct ieee80211_local *local = sdata->local;
 250
 251 -       if (!changed)
 252 +       if (!changed || sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
 253                 return;
 254
 255         drv_bss_info_changed(local, sdata, &sdata->vif.bss_conf, changed);
 256 --- a/drivers/net/wireless/ath/ath9k/ani.c
 257 +++ b/drivers/net/wireless/ath/ath9k/ani.c
 258 @@ -155,6 +155,9 @@ static void ath9k_hw_set_ofdm_nil(struct
 259                 ATH9K_ANI_RSSI_THR_LOW,
 260                 ATH9K_ANI_RSSI_THR_HIGH);
 261
 262 +       if (AR_SREV_9100(ah) && immunityLevel < ATH9K_ANI_OFDM_DEF_LEVEL)
 263 +               immunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;
 264 +
 265         if (!scan)
 266                 aniState->ofdmNoiseImmunityLevel = immunityLevel;
 267
 268 @@ -235,6 +238,9 @@ static void ath9k_hw_set_cck_nil(struct
 269                 BEACON_RSSI(ah), ATH9K_ANI_RSSI_THR_LOW,
 270                 ATH9K_ANI_RSSI_THR_HIGH);
 271
 272 +       if (AR_SREV_9100(ah) && immunityLevel < ATH9K_ANI_CCK_DEF_LEVEL)
 273 +               immunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;
 274 +
 275         if (ah->opmode == NL80211_IFTYPE_STATION &&
 276             BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_LOW &&
 277             immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)
 278 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 279 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
 280 @@ -251,7 +251,6 @@ struct ath_atx_tid {
 281
 282         s8 bar_index;
 283         bool sched;
 284 -       bool paused;
 285         bool active;
 286  };
 287
 288 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 289 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
 290 @@ -107,9 +107,6 @@ static void ath_tx_queue_tid(struct ath_
 291  {
 292         struct ath_atx_ac *ac = tid->ac;
 293
 294 -       if (tid->paused)
 295 -               return;
 296 -
 297         if (tid->sched)
 298                 return;
 299
 300 @@ -1407,7 +1404,6 @@ int ath_tx_aggr_start(struct ath_softc *
 301         ath_tx_tid_change_state(sc, txtid);
 302
 303         txtid->active = true;
 304 -       txtid->paused = true;
 305         *ssn = txtid->seq_start = txtid->seq_next;
 306         txtid->bar_index = -1;
 307
 308 @@ -1427,7 +1423,6 @@ void ath_tx_aggr_stop(struct ath_softc *
 309
 310         ath_txq_lock(sc, txq);
 311         txtid->active = false;
 312 -       txtid->paused = false;
 313         ath_tx_flush_tid(sc, txtid);
 314         ath_tx_tid_change_state(sc, txtid);
 315         ath_txq_unlock_complete(sc, txq);
 316 @@ -1487,7 +1482,7 @@ void ath_tx_aggr_wakeup(struct ath_softc
 317                 ath_txq_lock(sc, txq);
 318                 ac->clear_ps_filter = true;
 319
 320 -               if (!tid->paused && ath_tid_has_buffered(tid)) {
 321 +               if (ath_tid_has_buffered(tid)) {
 322                         ath_tx_queue_tid(txq, tid);
 323                         ath_txq_schedule(sc, txq);
 324                 }
 325 @@ -1510,7 +1505,6 @@ void ath_tx_aggr_resume(struct ath_softc
 326         ath_txq_lock(sc, txq);
 327
 328         tid->baw_size = IEEE80211_MIN_AMPDU_BUF << sta->ht_cap.ampdu_factor;
 329 -       tid->paused = false;
 330
 331         if (ath_tid_has_buffered(tid)) {
 332                 ath_tx_queue_tid(txq, tid);
 333 @@ -1544,8 +1538,6 @@ void ath9k_release_buffered_frames(struc
 334                         continue;
 335
 336                 tid = ATH_AN_2_TID(an, i);
 337 -               if (tid->paused)
 338 -                       continue;
 339
 340                 ath_txq_lock(sc, tid->ac->txq);
 341                 while (nframes > 0) {
 342 @@ -1844,9 +1836,6 @@ void ath_txq_schedule(struct ath_softc *
 343                         list_del(&tid->list);
 344                         tid->sched = false;
 345
 346 -                       if (tid->paused)
 347 -                               continue;
 348 -
 349                         if (ath_tx_sched_aggr(sc, txq, tid, &stop))
 350                                 sent = true;
 351
 352 @@ -2698,7 +2687,6 @@ void ath_tx_node_init(struct ath_softc *
 353                 tid->baw_size  = WME_MAX_BA;
 354                 tid->baw_head  = tid->baw_tail = 0;
 355                 tid->sched     = false;
 356 -               tid->paused    = false;
 357                 tid->active        = false;
 358                 __skb_queue_head_init(&tid->buf_q);
 359                 __skb_queue_head_init(&tid->retry_q);
 360 --- a/drivers/net/wireless/ath/ath9k/recv.c
 361 +++ b/drivers/net/wireless/ath/ath9k/recv.c
 362 @@ -975,6 +975,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
 363         u64 tsf = 0;
 364         unsigned long flags;
 365         dma_addr_t new_buf_addr;
 366 +       unsigned int budget = 512;
 367
 368         if (edma)
 369                 dma_type = DMA_BIDIRECTIONAL;
 370 @@ -1113,15 +1114,17 @@ requeue_drop_frag:
 371                 }
 372  requeue:
 373                 list_add_tail(&bf->list, &sc->rx.rxbuf);
 374 -               if (flush)
 375 -                       continue;
 376
 377                 if (edma) {
 378                         ath_rx_edma_buf_link(sc, qtype);
 379                 } else {
 380                         ath_rx_buf_relink(sc, bf);
 381 -                       ath9k_hw_rxena(ah);
 382 +                       if (!flush)
 383 +                               ath9k_hw_rxena(ah);
 384                 }
 385 +
 386 +               if (!budget--)
 387 +                       break;
 388         } while (1);
 389
 390         if (!(ah->imask & ATH9K_INT_RXEOL)) {
 391 --- a/drivers/net/wireless/ath/ath9k/ahb.c
 392 +++ b/drivers/net/wireless/ath/ath9k/ahb.c
 393 @@ -86,7 +86,6 @@ static int ath_ahb_probe(struct platform
 394         int irq;
 395         int ret = 0;
 396         struct ath_hw *ah;
 397 -       struct ath_common *common;
 398         char hw_name[64];
 399
 400         if (!dev_get_platdata(&pdev->dev)) {
 401 @@ -146,9 +145,6 @@ static int ath_ahb_probe(struct platform
 402         wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n",
 403                    hw_name, (unsigned long)mem, irq);
 404
 405 -       common = ath9k_hw_common(sc->sc_ah);
 406 -       /* Will be cleared in ath9k_start() */
 407 -       set_bit(ATH_OP_INVALID, &common->op_flags);
 408         return 0;
 409
 410   err_irq:
 411 --- a/drivers/net/wireless/ath/ath9k/init.c
 412 +++ b/drivers/net/wireless/ath/ath9k/init.c
 413 @@ -670,6 +670,7 @@ static const struct ieee80211_iface_comb
 414                 .num_different_channels = 1,
 415                 .beacon_int_infra_match = true,
 416         },
 417 +#ifdef CONFIG_ATH9K_DFS_CERTIFIED
 418         {
 419                 .limits = if_dfs_limits,
 420                 .n_limits = ARRAY_SIZE(if_dfs_limits),
 421 @@ -679,6 +680,7 @@ static const struct ieee80211_iface_comb
 422                 .radar_detect_widths =  BIT(NL80211_CHAN_WIDTH_20_NOHT) |
 423                                         BIT(NL80211_CHAN_WIDTH_20),
 424         }
 425 +#endif
 426  };
 427
 428  static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
 429 @@ -781,6 +783,9 @@ int ath9k_init_device(u16 devid, struct
 430         common = ath9k_hw_common(ah);
 431         ath9k_set_hw_capab(sc, hw);
 432
 433 +       /* Will be cleared in ath9k_start() */
 434 +       set_bit(ATH_OP_INVALID, &common->op_flags);
 435 +
 436         /* Initialize regulatory */
 437         error = ath_regd_init(&common->regulatory, sc->hw->wiphy,
 438                               ath9k_reg_notifier);
 439 --- a/drivers/net/wireless/ath/ath9k/pci.c
 440 +++ b/drivers/net/wireless/ath/ath9k/pci.c
 441 @@ -784,7 +784,6 @@ static int ath_pci_probe(struct pci_dev
 442  {
 443         struct ath_softc *sc;
 444         struct ieee80211_hw *hw;
 445 -       struct ath_common *common;
 446         u8 csz;
 447         u32 val;
 448         int ret = 0;
 449 @@ -877,10 +876,6 @@ static int ath_pci_probe(struct pci_dev
 450         wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n",
 451                    hw_name, (unsigned long)sc->mem, pdev->irq);
 452
 453 -       /* Will be cleared in ath9k_start() */
 454 -       common = ath9k_hw_common(sc->sc_ah);
 455 -       set_bit(ATH_OP_INVALID, &common->op_flags);
 456 -
 457         return 0;
 458
 459  err_init:
 460 --- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
 461 +++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
 462 @@ -410,7 +410,7 @@ static const u32 ar9300_2p2_baseband_cor
 463         {0x00009e30, 0x06336f77},
 464         {0x00009e34, 0x6af6532f},
 465         {0x00009e38, 0x0cc80c00},
 466 -       {0x00009e40, 0x0d261820},
 467 +       {0x00009e40, 0x0d261800},
 468         {0x00009e4c, 0x00001004},
 469         {0x00009e50, 0x00ff03f1},
 470         {0x00009e54, 0x00000000},
 471 --- a/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
 472 +++ b/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
 473 @@ -592,7 +592,7 @@ static const u32 ar9331_1p1_baseband_cor
 474         {0x00009e30, 0x06336f77},
 475         {0x00009e34, 0x6af6532f},
 476         {0x00009e38, 0x0cc80c00},
 477 -       {0x00009e40, 0x0d261820},
 478 +       {0x00009e40, 0x0d261800},
 479         {0x00009e4c, 0x00001004},
 480         {0x00009e50, 0x00ff03f1},
 481         {0x00009fc0, 0x803e4788},
 482 --- a/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
 483 +++ b/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
 484 @@ -231,7 +231,7 @@ static const u32 ar9331_1p2_baseband_cor
 485         {0x00009e30, 0x06336f77},
 486         {0x00009e34, 0x6af6532f},
 487         {0x00009e38, 0x0cc80c00},
 488 -       {0x00009e40, 0x0d261820},
 489 +       {0x00009e40, 0x0d261800},
 490         {0x00009e4c, 0x00001004},
 491         {0x00009e50, 0x00ff03f1},
 492         {0x00009fc0, 0x803e4788},
 493 --- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
 494 +++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
 495 @@ -318,7 +318,7 @@ static const u32 ar9340_1p0_baseband_cor
 496         {0x00009e30, 0x06336f77},
 497         {0x00009e34, 0x6af6532f},
 498         {0x00009e38, 0x0cc80c00},
 499 -       {0x00009e40, 0x0d261820},
 500 +       {0x00009e40, 0x0d261800},
 501         {0x00009e4c, 0x00001004},
 502         {0x00009e50, 0x00ff03f1},
 503         {0x00009e54, 0x00000000},
 504 @@ -348,9 +348,9 @@ static const u32 ar9340_1p0_baseband_cor
 505         {0x0000a370, 0x00000000},
 506         {0x0000a390, 0x00000001},
 507         {0x0000a394, 0x00000444},
 508 -       {0x0000a398, 0x00000000},
 509 -       {0x0000a39c, 0x210d0401},
 510 -       {0x0000a3a0, 0xab9a7144},
 511 +       {0x0000a398, 0x001f0e0f},
 512 +       {0x0000a39c, 0x0075393f},
 513 +       {0x0000a3a0, 0xb79f6427},
 514         {0x0000a3a4, 0x00000000},
 515         {0x0000a3a8, 0xaaaaaaaa},
 516         {0x0000a3ac, 0x3c466478},
 517 --- a/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
 518 +++ b/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
 519 @@ -90,7 +90,7 @@ static const u32 ar9580_1p0_baseband_cor
 520         {0x00009e30, 0x06336f77},
 521         {0x00009e34, 0x6af6532f},
 522         {0x00009e38, 0x0cc80c00},
 523 -       {0x00009e40, 0x0d261820},
 524 +       {0x00009e40, 0x0d261800},
 525         {0x00009e4c, 0x00001004},
 526         {0x00009e50, 0x00ff03f1},
 527         {0x00009e54, 0x00000000},
 528 --- a/drivers/net/wireless/ath/ath9k/ar953x_initvals.h
 529 +++ b/drivers/net/wireless/ath/ath9k/ar953x_initvals.h
 530 @@ -257,9 +257,9 @@ static const u32 qca953x_1p0_baseband_co
 531         {0x0000a370, 0x00000000},
 532         {0x0000a390, 0x00000001},
 533         {0x0000a394, 0x00000444},
 534 -       {0x0000a398, 0x1f020503},
 535 -       {0x0000a39c, 0x29180c03},
 536 -       {0x0000a3a0, 0x9a8b6844},
 537 +       {0x0000a398, 0x001f0e0f},
 538 +       {0x0000a39c, 0x0075393f},
 539 +       {0x0000a3a0, 0xb79f6427},
 540         {0x0000a3a4, 0x000000ff},
 541         {0x0000a3a8, 0x6a6a6a6a},
 542         {0x0000a3ac, 0x6a6a6a6a},
 543 --- a/drivers/net/wireless/ath/ath5k/phy.c
 544 +++ b/drivers/net/wireless/ath/ath5k/phy.c
 545 @@ -3709,8 +3709,8 @@ ath5k_hw_txpower(struct ath5k_hw *ah, st
 546                         AR5K_REG_MS(AR5K_TUNE_MAX_TXPOWER, AR5K_TPC_CHIRP),
 547                         AR5K_TPC);
 548         } else {
 549 -               ath5k_hw_reg_write(ah, AR5K_PHY_TXPOWER_RATE_MAX |
 550 -                       AR5K_TUNE_MAX_TXPOWER, AR5K_PHY_TXPOWER_RATE_MAX);
 551 +               ath5k_hw_reg_write(ah, AR5K_TUNE_MAX_TXPOWER,
 552 +                       AR5K_PHY_TXPOWER_RATE_MAX);
 553         }
 554
 555         return 0;
 556 --- a/net/mac80211/rx.c
 557 +++ b/net/mac80211/rx.c
 558 @@ -1231,7 +1231,8 @@ ieee80211_rx_h_sta_process(struct ieee80
 559                 if (ether_addr_equal(bssid, rx->sdata->u.ibss.bssid) &&
 560                     test_sta_flag(sta, WLAN_STA_AUTHORIZED)) {
 561                         sta->last_rx = jiffies;
 562 -                       if (ieee80211_is_data(hdr->frame_control)) {
 563 +                       if (ieee80211_is_data(hdr->frame_control) &&
 564 +                           !is_multicast_ether_addr(hdr->addr1)) {
 565                                 sta->last_rx_rate_idx = status->rate_idx;
 566                                 sta->last_rx_rate_flag = status->flag;
 567                                 sta->last_rx_rate_vht_flag = status->vht_flag;