---- a/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
-@@ -459,97 +459,6 @@ static const u32 ar5416Common_9100[][2]
- {0x0000a3e0, 0x000001ce},
- };
-
--static const u32 ar5416Bank0_9100[][2] = {
-- /* Addr allmodes */
-- {0x000098b0, 0x1e5795e5},
-- {0x000098e0, 0x02008020},
--};
--
--static const u32 ar5416BB_RfGain_9100[][3] = {
-- /* Addr 5G_HT20 5G_HT40 */
-- {0x00009a00, 0x00000000, 0x00000000},
-- {0x00009a04, 0x00000040, 0x00000040},
-- {0x00009a08, 0x00000080, 0x00000080},
-- {0x00009a0c, 0x000001a1, 0x00000141},
-- {0x00009a10, 0x000001e1, 0x00000181},
-- {0x00009a14, 0x00000021, 0x000001c1},
-- {0x00009a18, 0x00000061, 0x00000001},
-- {0x00009a1c, 0x00000168, 0x00000041},
-- {0x00009a20, 0x000001a8, 0x000001a8},
-- {0x00009a24, 0x000001e8, 0x000001e8},
-- {0x00009a28, 0x00000028, 0x00000028},
-- {0x00009a2c, 0x00000068, 0x00000068},
-- {0x00009a30, 0x00000189, 0x000000a8},
-- {0x00009a34, 0x000001c9, 0x00000169},
-- {0x00009a38, 0x00000009, 0x000001a9},
-- {0x00009a3c, 0x00000049, 0x000001e9},
-- {0x00009a40, 0x00000089, 0x00000029},
-- {0x00009a44, 0x00000170, 0x00000069},
-- {0x00009a48, 0x000001b0, 0x00000190},
-- {0x00009a4c, 0x000001f0, 0x000001d0},
-- {0x00009a50, 0x00000030, 0x00000010},
-- {0x00009a54, 0x00000070, 0x00000050},
-- {0x00009a58, 0x00000191, 0x00000090},
-- {0x00009a5c, 0x000001d1, 0x00000151},
-- {0x00009a60, 0x00000011, 0x00000191},
-- {0x00009a64, 0x00000051, 0x000001d1},
-- {0x00009a68, 0x00000091, 0x00000011},
-- {0x00009a6c, 0x000001b8, 0x00000051},
-- {0x00009a70, 0x000001f8, 0x00000198},
-- {0x00009a74, 0x00000038, 0x000001d8},
-- {0x00009a78, 0x00000078, 0x00000018},
-- {0x00009a7c, 0x00000199, 0x00000058},
-- {0x00009a80, 0x000001d9, 0x00000098},
-- {0x00009a84, 0x00000019, 0x00000159},
-- {0x00009a88, 0x00000059, 0x00000199},
-- {0x00009a8c, 0x00000099, 0x000001d9},
-- {0x00009a90, 0x000000d9, 0x00000019},
-- {0x00009a94, 0x000000f9, 0x00000059},
-- {0x00009a98, 0x000000f9, 0x00000099},
-- {0x00009a9c, 0x000000f9, 0x000000d9},
-- {0x00009aa0, 0x000000f9, 0x000000f9},
-- {0x00009aa4, 0x000000f9, 0x000000f9},
-- {0x00009aa8, 0x000000f9, 0x000000f9},
-- {0x00009aac, 0x000000f9, 0x000000f9},
-- {0x00009ab0, 0x000000f9, 0x000000f9},
-- {0x00009ab4, 0x000000f9, 0x000000f9},
-- {0x00009ab8, 0x000000f9, 0x000000f9},
-- {0x00009abc, 0x000000f9, 0x000000f9},
-- {0x00009ac0, 0x000000f9, 0x000000f9},
-- {0x00009ac4, 0x000000f9, 0x000000f9},
-- {0x00009ac8, 0x000000f9, 0x000000f9},
-- {0x00009acc, 0x000000f9, 0x000000f9},
-- {0x00009ad0, 0x000000f9, 0x000000f9},
-- {0x00009ad4, 0x000000f9, 0x000000f9},
-- {0x00009ad8, 0x000000f9, 0x000000f9},
-- {0x00009adc, 0x000000f9, 0x000000f9},
-- {0x00009ae0, 0x000000f9, 0x000000f9},
-- {0x00009ae4, 0x000000f9, 0x000000f9},
-- {0x00009ae8, 0x000000f9, 0x000000f9},
-- {0x00009aec, 0x000000f9, 0x000000f9},
-- {0x00009af0, 0x000000f9, 0x000000f9},
-- {0x00009af4, 0x000000f9, 0x000000f9},
-- {0x00009af8, 0x000000f9, 0x000000f9},
-- {0x00009afc, 0x000000f9, 0x000000f9},
--};
--
--static const u32 ar5416Bank1_9100[][2] = {
-- /* Addr allmodes */
-- {0x000098b0, 0x02108421},
-- {0x000098ec, 0x00000008},
--};
--
--static const u32 ar5416Bank2_9100[][2] = {
-- /* Addr allmodes */
-- {0x000098b0, 0x0e73ff17},
-- {0x000098e0, 0x00000420},
--};
--
--static const u32 ar5416Bank3_9100[][3] = {
-- /* Addr 5G_HT20 5G_HT40 */
-- {0x000098f0, 0x01400018, 0x01c00018},
--};
--
- static const u32 ar5416Bank6_9100[][3] = {
- /* Addr 5G_HT20 5G_HT40 */
- {0x0000989c, 0x00000000, 0x00000000},
-@@ -624,13 +533,6 @@ static const u32 ar5416Bank6TPC_9100[][3
- {0x000098d0, 0x0000000f, 0x0010000f},
- };
-
--static const u32 ar5416Bank7_9100[][2] = {
-- /* Addr allmodes */
-- {0x0000989c, 0x00000500},
-- {0x0000989c, 0x00000800},
-- {0x000098cc, 0x0000000e},
--};
--
- static const u32 ar5416Addac_9100[][2] = {
- /* Addr allmodes */
- {0x0000989c, 0x00000000},
-@@ -1113,178 +1015,6 @@ static const u32 ar5416Common_9160[][2]
- {0x0000a3e0, 0x000001ce},
- };
-
--static const u32 ar5416Bank0_9160[][2] = {
-- /* Addr allmodes */
-- {0x000098b0, 0x1e5795e5},
-- {0x000098e0, 0x02008020},
--};
--
--static const u32 ar5416BB_RfGain_9160[][3] = {
-- /* Addr 5G_HT20 5G_HT40 */
-- {0x00009a00, 0x00000000, 0x00000000},
-- {0x00009a04, 0x00000040, 0x00000040},
-- {0x00009a08, 0x00000080, 0x00000080},
-- {0x00009a0c, 0x000001a1, 0x00000141},
-- {0x00009a10, 0x000001e1, 0x00000181},
-- {0x00009a14, 0x00000021, 0x000001c1},
-- {0x00009a18, 0x00000061, 0x00000001},
-- {0x00009a1c, 0x00000168, 0x00000041},
-- {0x00009a20, 0x000001a8, 0x000001a8},
-- {0x00009a24, 0x000001e8, 0x000001e8},
-- {0x00009a28, 0x00000028, 0x00000028},
-- {0x00009a2c, 0x00000068, 0x00000068},
-- {0x00009a30, 0x00000189, 0x000000a8},
-- {0x00009a34, 0x000001c9, 0x00000169},
-- {0x00009a38, 0x00000009, 0x000001a9},
-- {0x00009a3c, 0x00000049, 0x000001e9},
-- {0x00009a40, 0x00000089, 0x00000029},
-- {0x00009a44, 0x00000170, 0x00000069},
-- {0x00009a48, 0x000001b0, 0x00000190},
-- {0x00009a4c, 0x000001f0, 0x000001d0},
-- {0x00009a50, 0x00000030, 0x00000010},
-- {0x00009a54, 0x00000070, 0x00000050},
-- {0x00009a58, 0x00000191, 0x00000090},
-- {0x00009a5c, 0x000001d1, 0x00000151},
-- {0x00009a60, 0x00000011, 0x00000191},
-- {0x00009a64, 0x00000051, 0x000001d1},
-- {0x00009a68, 0x00000091, 0x00000011},
-- {0x00009a6c, 0x000001b8, 0x00000051},
-- {0x00009a70, 0x000001f8, 0x00000198},
-- {0x00009a74, 0x00000038, 0x000001d8},
-- {0x00009a78, 0x00000078, 0x00000018},
-- {0x00009a7c, 0x00000199, 0x00000058},
-- {0x00009a80, 0x000001d9, 0x00000098},
-- {0x00009a84, 0x00000019, 0x00000159},
-- {0x00009a88, 0x00000059, 0x00000199},
-- {0x00009a8c, 0x00000099, 0x000001d9},
-- {0x00009a90, 0x000000d9, 0x00000019},
-- {0x00009a94, 0x000000f9, 0x00000059},
-- {0x00009a98, 0x000000f9, 0x00000099},
-- {0x00009a9c, 0x000000f9, 0x000000d9},
-- {0x00009aa0, 0x000000f9, 0x000000f9},
-- {0x00009aa4, 0x000000f9, 0x000000f9},
-- {0x00009aa8, 0x000000f9, 0x000000f9},
-- {0x00009aac, 0x000000f9, 0x000000f9},
-- {0x00009ab0, 0x000000f9, 0x000000f9},
-- {0x00009ab4, 0x000000f9, 0x000000f9},
-- {0x00009ab8, 0x000000f9, 0x000000f9},
-- {0x00009abc, 0x000000f9, 0x000000f9},
-- {0x00009ac0, 0x000000f9, 0x000000f9},
-- {0x00009ac4, 0x000000f9, 0x000000f9},
-- {0x00009ac8, 0x000000f9, 0x000000f9},
-- {0x00009acc, 0x000000f9, 0x000000f9},
-- {0x00009ad0, 0x000000f9, 0x000000f9},
-- {0x00009ad4, 0x000000f9, 0x000000f9},
-- {0x00009ad8, 0x000000f9, 0x000000f9},
-- {0x00009adc, 0x000000f9, 0x000000f9},
-- {0x00009ae0, 0x000000f9, 0x000000f9},
-- {0x00009ae4, 0x000000f9, 0x000000f9},
-- {0x00009ae8, 0x000000f9, 0x000000f9},
-- {0x00009aec, 0x000000f9, 0x000000f9},
-- {0x00009af0, 0x000000f9, 0x000000f9},
-- {0x00009af4, 0x000000f9, 0x000000f9},
-- {0x00009af8, 0x000000f9, 0x000000f9},
-- {0x00009afc, 0x000000f9, 0x000000f9},
--};
--
--static const u32 ar5416Bank1_9160[][2] = {
-- /* Addr allmodes */
-- {0x000098b0, 0x02108421},
-- {0x000098ec, 0x00000008},
--};
--
--static const u32 ar5416Bank2_9160[][2] = {
-- /* Addr allmodes */
-- {0x000098b0, 0x0e73ff17},
-- {0x000098e0, 0x00000420},
--};
--
--static const u32 ar5416Bank3_9160[][3] = {
-- /* Addr 5G_HT20 5G_HT40 */
-- {0x000098f0, 0x01400018, 0x01c00018},
--};
--
--static const u32 ar5416Bank6_9160[][3] = {
-- /* Addr 5G_HT20 5G_HT40 */
-- {0x0000989c, 0x00000000, 0x00000000},
-- {0x0000989c, 0x00000000, 0x00000000},
-- {0x0000989c, 0x00000000, 0x00000000},
-- {0x0000989c, 0x00e00000, 0x00e00000},
-- {0x0000989c, 0x005e0000, 0x005e0000},
-- {0x0000989c, 0x00120000, 0x00120000},
-- {0x0000989c, 0x00620000, 0x00620000},
-- {0x0000989c, 0x00020000, 0x00020000},
-- {0x0000989c, 0x00ff0000, 0x00ff0000},
-- {0x0000989c, 0x00ff0000, 0x00ff0000},
-- {0x0000989c, 0x00ff0000, 0x00ff0000},
-- {0x0000989c, 0x40ff0000, 0x40ff0000},
-- {0x0000989c, 0x005f0000, 0x005f0000},
-- {0x0000989c, 0x00870000, 0x00870000},
-- {0x0000989c, 0x00f90000, 0x00f90000},
-- {0x0000989c, 0x007b0000, 0x007b0000},
-- {0x0000989c, 0x00ff0000, 0x00ff0000},
-- {0x0000989c, 0x00f50000, 0x00f50000},
-- {0x0000989c, 0x00dc0000, 0x00dc0000},
-- {0x0000989c, 0x00110000, 0x00110000},
-- {0x0000989c, 0x006100a8, 0x006100a8},
-- {0x0000989c, 0x004210a2, 0x004210a2},
-- {0x0000989c, 0x0014008f, 0x0014008f},
-- {0x0000989c, 0x00c40003, 0x00c40003},
-- {0x0000989c, 0x003000f2, 0x003000f2},
-- {0x0000989c, 0x00440016, 0x00440016},
-- {0x0000989c, 0x00410040, 0x00410040},
-- {0x0000989c, 0x0001805e, 0x0001805e},
-- {0x0000989c, 0x0000c0ab, 0x0000c0ab},
-- {0x0000989c, 0x000000f1, 0x000000f1},
-- {0x0000989c, 0x00002081, 0x00002081},
-- {0x0000989c, 0x000000d4, 0x000000d4},
-- {0x000098d0, 0x0000000f, 0x0010000f},
--};
--
--static const u32 ar5416Bank6TPC_9160[][3] = {
-- /* Addr 5G_HT20 5G_HT40 */
-- {0x0000989c, 0x00000000, 0x00000000},
-- {0x0000989c, 0x00000000, 0x00000000},
-- {0x0000989c, 0x00000000, 0x00000000},
-- {0x0000989c, 0x00e00000, 0x00e00000},
-- {0x0000989c, 0x005e0000, 0x005e0000},
-- {0x0000989c, 0x00120000, 0x00120000},
-- {0x0000989c, 0x00620000, 0x00620000},
-- {0x0000989c, 0x00020000, 0x00020000},
-- {0x0000989c, 0x00ff0000, 0x00ff0000},
-- {0x0000989c, 0x00ff0000, 0x00ff0000},
-- {0x0000989c, 0x00ff0000, 0x00ff0000},
-- {0x0000989c, 0x40ff0000, 0x40ff0000},
-- {0x0000989c, 0x005f0000, 0x005f0000},
-- {0x0000989c, 0x00870000, 0x00870000},
-- {0x0000989c, 0x00f90000, 0x00f90000},
-- {0x0000989c, 0x007b0000, 0x007b0000},
-- {0x0000989c, 0x00ff0000, 0x00ff0000},
-- {0x0000989c, 0x00f50000, 0x00f50000},
-- {0x0000989c, 0x00dc0000, 0x00dc0000},
-- {0x0000989c, 0x00110000, 0x00110000},
-- {0x0000989c, 0x006100a8, 0x006100a8},
-- {0x0000989c, 0x00423022, 0x00423022},
-- {0x0000989c, 0x2014008f, 0x2014008f},
-- {0x0000989c, 0x00c40002, 0x00c40002},
-- {0x0000989c, 0x003000f2, 0x003000f2},
-- {0x0000989c, 0x00440016, 0x00440016},
-- {0x0000989c, 0x00410040, 0x00410040},
-- {0x0000989c, 0x0001805e, 0x0001805e},
-- {0x0000989c, 0x0000c0ab, 0x0000c0ab},
-- {0x0000989c, 0x000000e1, 0x000000e1},
-- {0x0000989c, 0x00007080, 0x00007080},
-- {0x0000989c, 0x000000d4, 0x000000d4},
-- {0x000098d0, 0x0000000f, 0x0010000f},
--};
--
--static const u32 ar5416Bank7_9160[][2] = {
-- /* Addr allmodes */
-- {0x0000989c, 0x00000500},
-- {0x0000989c, 0x00000800},
-- {0x000098cc, 0x0000000e},
--};
--
- static const u32 ar5416Addac_9160[][2] = {
- /* Addr allmodes */
- {0x0000989c, 0x00000000},
---- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
-@@ -35,11 +35,11 @@ static void ar9002_hw_init_mode_regs(str
- INIT_INI_ARRAY(&ah->iniCommon, ar9271Common_9271,
- ARRAY_SIZE(ar9271Common_9271), 2);
- INIT_INI_ARRAY(&ah->iniCommon_normal_cck_fir_coeff_9271,
-- ar9271Common_normal_cck_fir_coeff_9271,
-- ARRAY_SIZE(ar9271Common_normal_cck_fir_coeff_9271), 2);
-+ ar9287Common_normal_cck_fir_coeff_9287_1_1,
-+ ARRAY_SIZE(ar9287Common_normal_cck_fir_coeff_9287_1_1), 2);
- INIT_INI_ARRAY(&ah->iniCommon_japan_2484_cck_fir_coeff_9271,
-- ar9271Common_japan_2484_cck_fir_coeff_9271,
-- ARRAY_SIZE(ar9271Common_japan_2484_cck_fir_coeff_9271), 2);
-+ ar9287Common_japan_2484_cck_fir_coeff_9287_1_1,
-+ ARRAY_SIZE(ar9287Common_japan_2484_cck_fir_coeff_9287_1_1), 2);
- INIT_INI_ARRAY(&ah->iniModes_9271_1_0_only,
- ar9271Modes_9271_1_0_only,
- ARRAY_SIZE(ar9271Modes_9271_1_0_only), 5);
-@@ -54,53 +54,31 @@ static void ar9002_hw_init_mode_regs(str
- return;
- }
-
-+ if (ah->config.pcie_clock_req)
-+ INIT_INI_ARRAY(&ah->iniPcieSerdes,
-+ ar9280PciePhy_clkreq_off_L1_9280,
-+ ARRAY_SIZE(ar9280PciePhy_clkreq_off_L1_9280), 2);
-+ else
-+ INIT_INI_ARRAY(&ah->iniPcieSerdes,
-+ ar9280PciePhy_clkreq_always_on_L1_9280,
-+ ARRAY_SIZE(ar9280PciePhy_clkreq_always_on_L1_9280), 2);
+--- a/drivers/net/wireless/ath/ath9k/common.h
++++ b/drivers/net/wireless/ath/ath9k/common.h
+@@ -27,7 +27,7 @@
+ #define WME_MAX_BA WME_BA_BMP_SIZE
+ #define ATH_TID_MAX_BUFS (2 * WME_MAX_BA)
+
+-#define ATH_RSSI_DUMMY_MARKER 0x127
++#define ATH_RSSI_DUMMY_MARKER 127
+ #define ATH_RSSI_LPF_LEN 10
+ #define RSSI_LPF_THRESHOLD -20
+ #define ATH_RSSI_EP_MULTIPLIER (1<<7)
+--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
++++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+@@ -1067,15 +1067,19 @@ static bool ath9k_rx_prepare(struct ath9
+
+ last_rssi = priv->rx.last_rssi;
+
+- if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
+- rxbuf->rxstatus.rs_rssi = ATH_EP_RND(last_rssi,
+- ATH_RSSI_EP_MULTIPLIER);
++ if (ieee80211_is_beacon(hdr->frame_control) &&
++ !is_zero_ether_addr(common->curbssid) &&
++ ether_addr_equal(hdr->addr3, common->curbssid)) {
++ s8 rssi = rxbuf->rxstatus.rs_rssi;
+
+- if (rxbuf->rxstatus.rs_rssi < 0)
+- rxbuf->rxstatus.rs_rssi = 0;
++ if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
++ rssi = ATH_EP_RND(last_rssi, ATH_RSSI_EP_MULTIPLIER);
+
+- if (ieee80211_is_beacon(fc))
+- priv->ah->stats.avgbrssi = rxbuf->rxstatus.rs_rssi;
++ if (rssi < 0)
++ rssi = 0;
+
- if (AR_SREV_9287_11_OR_LATER(ah)) {
- INIT_INI_ARRAY(&ah->iniModes, ar9287Modes_9287_1_1,
- ARRAY_SIZE(ar9287Modes_9287_1_1), 5);
- INIT_INI_ARRAY(&ah->iniCommon, ar9287Common_9287_1_1,
- ARRAY_SIZE(ar9287Common_9287_1_1), 2);
-- if (ah->config.pcie_clock_req)
-- INIT_INI_ARRAY(&ah->iniPcieSerdes,
-- ar9287PciePhy_clkreq_off_L1_9287_1_1,
-- ARRAY_SIZE(ar9287PciePhy_clkreq_off_L1_9287_1_1), 2);
-- else
-- INIT_INI_ARRAY(&ah->iniPcieSerdes,
-- ar9287PciePhy_clkreq_always_on_L1_9287_1_1,
-- ARRAY_SIZE(ar9287PciePhy_clkreq_always_on_L1_9287_1_1),
-- 2);
- } else if (AR_SREV_9285_12_OR_LATER(ah)) {
--
--
- INIT_INI_ARRAY(&ah->iniModes, ar9285Modes_9285_1_2,
- ARRAY_SIZE(ar9285Modes_9285_1_2), 5);
- INIT_INI_ARRAY(&ah->iniCommon, ar9285Common_9285_1_2,
- ARRAY_SIZE(ar9285Common_9285_1_2), 2);
--
-- if (ah->config.pcie_clock_req) {
-- INIT_INI_ARRAY(&ah->iniPcieSerdes,
-- ar9285PciePhy_clkreq_off_L1_9285_1_2,
-- ARRAY_SIZE(ar9285PciePhy_clkreq_off_L1_9285_1_2), 2);
-- } else {
-- INIT_INI_ARRAY(&ah->iniPcieSerdes,
-- ar9285PciePhy_clkreq_always_on_L1_9285_1_2,
-- ARRAY_SIZE(ar9285PciePhy_clkreq_always_on_L1_9285_1_2),
-- 2);
-- }
- } else if (AR_SREV_9280_20_OR_LATER(ah)) {
- INIT_INI_ARRAY(&ah->iniModes, ar9280Modes_9280_2,
- ARRAY_SIZE(ar9280Modes_9280_2), 5);
- INIT_INI_ARRAY(&ah->iniCommon, ar9280Common_9280_2,
- ARRAY_SIZE(ar9280Common_9280_2), 2);
-
-- if (ah->config.pcie_clock_req) {
-- INIT_INI_ARRAY(&ah->iniPcieSerdes,
-- ar9280PciePhy_clkreq_off_L1_9280,
-- ARRAY_SIZE(ar9280PciePhy_clkreq_off_L1_9280), 2);
-- } else {
-- INIT_INI_ARRAY(&ah->iniPcieSerdes,
-- ar9280PciePhy_clkreq_always_on_L1_9280,
-- ARRAY_SIZE(ar9280PciePhy_clkreq_always_on_L1_9280), 2);
-- }
- INIT_INI_ARRAY(&ah->iniModesAdditional,
- ar9280Modes_fast_clock_9280_2,
- ARRAY_SIZE(ar9280Modes_fast_clock_9280_2), 3);
-@@ -109,22 +87,6 @@ static void ar9002_hw_init_mode_regs(str
- ARRAY_SIZE(ar5416Modes_9160), 5);
- INIT_INI_ARRAY(&ah->iniCommon, ar5416Common_9160,
- ARRAY_SIZE(ar5416Common_9160), 2);
-- INIT_INI_ARRAY(&ah->iniBank0, ar5416Bank0_9160,
-- ARRAY_SIZE(ar5416Bank0_9160), 2);
-- INIT_INI_ARRAY(&ah->iniBB_RfGain, ar5416BB_RfGain_9160,
-- ARRAY_SIZE(ar5416BB_RfGain_9160), 3);
-- INIT_INI_ARRAY(&ah->iniBank1, ar5416Bank1_9160,
-- ARRAY_SIZE(ar5416Bank1_9160), 2);
-- INIT_INI_ARRAY(&ah->iniBank2, ar5416Bank2_9160,
-- ARRAY_SIZE(ar5416Bank2_9160), 2);
-- INIT_INI_ARRAY(&ah->iniBank3, ar5416Bank3_9160,
-- ARRAY_SIZE(ar5416Bank3_9160), 3);
-- INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6_9160,
-- ARRAY_SIZE(ar5416Bank6_9160), 3);
-- INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC_9160,
-- ARRAY_SIZE(ar5416Bank6TPC_9160), 3);
-- INIT_INI_ARRAY(&ah->iniBank7, ar5416Bank7_9160,
-- ARRAY_SIZE(ar5416Bank7_9160), 2);
- if (AR_SREV_9160_11(ah)) {
- INIT_INI_ARRAY(&ah->iniAddac,
- ar5416Addac_9160_1_1,
-@@ -138,22 +100,8 @@ static void ar9002_hw_init_mode_regs(str
- ARRAY_SIZE(ar5416Modes_9100), 5);
- INIT_INI_ARRAY(&ah->iniCommon, ar5416Common_9100,
- ARRAY_SIZE(ar5416Common_9100), 2);
-- INIT_INI_ARRAY(&ah->iniBank0, ar5416Bank0_9100,
-- ARRAY_SIZE(ar5416Bank0_9100), 2);
-- INIT_INI_ARRAY(&ah->iniBB_RfGain, ar5416BB_RfGain_9100,
-- ARRAY_SIZE(ar5416BB_RfGain_9100), 3);
-- INIT_INI_ARRAY(&ah->iniBank1, ar5416Bank1_9100,
-- ARRAY_SIZE(ar5416Bank1_9100), 2);
-- INIT_INI_ARRAY(&ah->iniBank2, ar5416Bank2_9100,
-- ARRAY_SIZE(ar5416Bank2_9100), 2);
-- INIT_INI_ARRAY(&ah->iniBank3, ar5416Bank3_9100,
-- ARRAY_SIZE(ar5416Bank3_9100), 3);
- INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6_9100,
- ARRAY_SIZE(ar5416Bank6_9100), 3);
-- INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC_9100,
-- ARRAY_SIZE(ar5416Bank6TPC_9100), 3);
-- INIT_INI_ARRAY(&ah->iniBank7, ar5416Bank7_9100,
-- ARRAY_SIZE(ar5416Bank7_9100), 2);
- INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9100,
- ARRAY_SIZE(ar5416Addac_9100), 2);
- } else {
-@@ -161,24 +109,37 @@ static void ar9002_hw_init_mode_regs(str
- ARRAY_SIZE(ar5416Modes), 5);
- INIT_INI_ARRAY(&ah->iniCommon, ar5416Common,
- ARRAY_SIZE(ar5416Common), 2);
-- INIT_INI_ARRAY(&ah->iniBank0, ar5416Bank0,
-- ARRAY_SIZE(ar5416Bank0), 2);
-+ INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC,
-+ ARRAY_SIZE(ar5416Bank6TPC), 3);
-+ INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac,
-+ ARRAY_SIZE(ar5416Addac), 2);
++ priv->ah->stats.avgbrssi = rssi;
+ }
-+
-+ if (!AR_SREV_9280_20_OR_LATER(ah)) {
-+ /* Common for AR5416, AR913x, AR9160 */
- INIT_INI_ARRAY(&ah->iniBB_RfGain, ar5416BB_RfGain,
- ARRAY_SIZE(ar5416BB_RfGain), 3);
-+
-+ INIT_INI_ARRAY(&ah->iniBank0, ar5416Bank0,
-+ ARRAY_SIZE(ar5416Bank0), 2);
- INIT_INI_ARRAY(&ah->iniBank1, ar5416Bank1,
- ARRAY_SIZE(ar5416Bank1), 2);
- INIT_INI_ARRAY(&ah->iniBank2, ar5416Bank2,
- ARRAY_SIZE(ar5416Bank2), 2);
- INIT_INI_ARRAY(&ah->iniBank3, ar5416Bank3,
- ARRAY_SIZE(ar5416Bank3), 3);
-- INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6,
-- ARRAY_SIZE(ar5416Bank6), 3);
-- INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC,
-- ARRAY_SIZE(ar5416Bank6TPC), 3);
- INIT_INI_ARRAY(&ah->iniBank7, ar5416Bank7,
- ARRAY_SIZE(ar5416Bank7), 2);
-- INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac,
-- ARRAY_SIZE(ar5416Addac), 2);
-+
-+ /* Common for AR5416, AR9160 */
-+ if (!AR_SREV_9100(ah))
-+ INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6,
-+ ARRAY_SIZE(ar5416Bank6), 3);
-+
-+ /* Common for AR913x, AR9160 */
-+ if (!AR_SREV_5416(ah))
-+ INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC_9100,
-+ ARRAY_SIZE(ar5416Bank6TPC_9100), 3);
- }
- /* iniAddac needs to be modified for these chips */
---- a/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
-@@ -925,34 +925,6 @@ static const u32 ar9280PciePhy_clkreq_al
- {0x00004044, 0x00000000},
- };
-
--static const u32 ar9285PciePhy_clkreq_always_on_L1_9285[][2] = {
-- /* Addr allmodes */
-- {0x00004040, 0x9248fd00},
-- {0x00004040, 0x24924924},
-- {0x00004040, 0xa8000019},
-- {0x00004040, 0x13160820},
-- {0x00004040, 0xe5980560},
-- {0x00004040, 0xc01dcffd},
-- {0x00004040, 0x1aaabe41},
-- {0x00004040, 0xbe105554},
-- {0x00004040, 0x00043007},
-- {0x00004044, 0x00000000},
--};
--
--static const u32 ar9285PciePhy_clkreq_off_L1_9285[][2] = {
-- /* Addr allmodes */
-- {0x00004040, 0x9248fd00},
-- {0x00004040, 0x24924924},
-- {0x00004040, 0xa8000019},
-- {0x00004040, 0x13160820},
-- {0x00004040, 0xe5980560},
-- {0x00004040, 0xc01dcffc},
-- {0x00004040, 0x1aaabe41},
-- {0x00004040, 0xbe105554},
-- {0x00004040, 0x00043007},
-- {0x00004044, 0x00000000},
--};
--
- static const u32 ar9285Modes_9285_1_2[][5] = {
- /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
- {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-@@ -1743,34 +1715,6 @@ static const u32 ar9285Modes_XE2_0_high_
- {0x0000a3e0, 0x000000e7, 0x000000e7, 0x000000e7, 0x000000e7},
- };
-
--static const u32 ar9285PciePhy_clkreq_always_on_L1_9285_1_2[][2] = {
-- /* Addr allmodes */
-- {0x00004040, 0x9248fd00},
-- {0x00004040, 0x24924924},
-- {0x00004040, 0xa8000019},
-- {0x00004040, 0x13160820},
-- {0x00004040, 0xe5980560},
-- {0x00004040, 0xc01dcffd},
-- {0x00004040, 0x1aaabe41},
-- {0x00004040, 0xbe105554},
-- {0x00004040, 0x00043007},
-- {0x00004044, 0x00000000},
--};
--
--static const u32 ar9285PciePhy_clkreq_off_L1_9285_1_2[][2] = {
-- /* Addr allmodes */
-- {0x00004040, 0x9248fd00},
-- {0x00004040, 0x24924924},
-- {0x00004040, 0xa8000019},
-- {0x00004040, 0x13160820},
-- {0x00004040, 0xe5980560},
-- {0x00004040, 0xc01dcffc},
-- {0x00004040, 0x1aaabe41},
-- {0x00004040, 0xbe105554},
-- {0x00004040, 0x00043007},
-- {0x00004044, 0x00000000},
--};
--
- static const u32 ar9287Modes_9287_1_1[][5] = {
- /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
- {0x00001030, 0x00000000, 0x00000000, 0x000002c0, 0x00000160},
-@@ -2512,34 +2456,6 @@ static const u32 ar9287Modes_rx_gain_928
- {0x0000a848, 0x00000000, 0x00000000, 0x00001067, 0x00001067},
- };
-
--static const u32 ar9287PciePhy_clkreq_always_on_L1_9287_1_1[][2] = {
-- /* Addr allmodes */
-- {0x00004040, 0x9248fd00},
-- {0x00004040, 0x24924924},
-- {0x00004040, 0xa8000019},
-- {0x00004040, 0x13160820},
-- {0x00004040, 0xe5980560},
-- {0x00004040, 0xc01dcffd},
-- {0x00004040, 0x1aaabe41},
-- {0x00004040, 0xbe105554},
-- {0x00004040, 0x00043007},
-- {0x00004044, 0x00000000},
--};
--
--static const u32 ar9287PciePhy_clkreq_off_L1_9287_1_1[][2] = {
-- /* Addr allmodes */
-- {0x00004040, 0x9248fd00},
-- {0x00004040, 0x24924924},
-- {0x00004040, 0xa8000019},
-- {0x00004040, 0x13160820},
-- {0x00004040, 0xe5980560},
-- {0x00004040, 0xc01dcffc},
-- {0x00004040, 0x1aaabe41},
-- {0x00004040, 0xbe105554},
-- {0x00004040, 0x00043007},
-- {0x00004044, 0x00000000},
--};
--
- static const u32 ar9271Modes_9271[][5] = {
- /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
- {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-@@ -3176,20 +3092,6 @@ static const u32 ar9271Common_9271[][2]
- {0x0000d384, 0xf3307ff0},
- };
-
--static const u32 ar9271Common_normal_cck_fir_coeff_9271[][2] = {
-- /* Addr allmodes */
-- {0x0000a1f4, 0x00fffeff},
-- {0x0000a1f8, 0x00f5f9ff},
-- {0x0000a1fc, 0xb79f6427},
--};
--
--static const u32 ar9271Common_japan_2484_cck_fir_coeff_9271[][2] = {
-- /* Addr allmodes */
-- {0x0000a1f4, 0x00000000},
-- {0x0000a1f8, 0xefff0301},
-- {0x0000a1fc, 0xca9228ee},
--};
--
- static const u32 ar9271Modes_9271_1_0_only[][5] = {
- /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
- {0x00009910, 0x30002311, 0x30002311, 0x30002311, 0x30002311},
+ rx_status->mactime = be64_to_cpu(rxbuf->rxstatus.rs_tstamp);
+ rx_status->band = hw->conf.channel->band;
+--- a/include/linux/ieee80211.h
++++ b/include/linux/ieee80211.h
+@@ -185,7 +185,7 @@ struct ieee80211_hdr {
+ u8 addr3[6];
+ __le16 seq_ctrl;
+ u8 addr4[6];
+-} __packed;
++} __packed __aligned(2);
+
+ struct ieee80211_hdr_3addr {
+ __le16 frame_control;
+@@ -194,7 +194,7 @@ struct ieee80211_hdr_3addr {
+ u8 addr2[6];
+ u8 addr3[6];
+ __le16 seq_ctrl;
+-} __packed;
++} __packed __aligned(2);
+
+ struct ieee80211_qos_hdr {
+ __le16 frame_control;
+@@ -204,7 +204,7 @@ struct ieee80211_qos_hdr {
+ u8 addr3[6];
+ __le16 seq_ctrl;
+ __le16 qos_ctrl;
+-} __packed;
++} __packed __aligned(2);
+
+ /**
+ * ieee80211_has_tods - check if IEEE80211_FCTL_TODS is set
+@@ -581,7 +581,7 @@ struct ieee80211s_hdr {
+ __le32 seqnum;
+ u8 eaddr1[6];
+ u8 eaddr2[6];
+-} __packed;
++} __packed __aligned(2);
+
+ /* Mesh flags */
+ #define MESH_FLAGS_AE_A4 0x1
+@@ -875,7 +875,7 @@ struct ieee80211_mgmt {
+ } u;
+ } __packed action;
+ } u;
+-} __packed;
++} __packed __aligned(2);
+
+ /* Supported Rates value encodings in 802.11n-2009 7.3.2.2 */
+ #define BSS_MEMBERSHIP_SELECTOR_HT_PHY 127
+@@ -906,20 +906,20 @@ struct ieee80211_rts {
+ __le16 duration;
+ u8 ra[6];
+ u8 ta[6];
+-} __packed;
++} __packed __aligned(2);
+
+ struct ieee80211_cts {
+ __le16 frame_control;
+ __le16 duration;
+ u8 ra[6];
+-} __packed;
++} __packed __aligned(2);
+
+ struct ieee80211_pspoll {
+ __le16 frame_control;
+ __le16 aid;
+ u8 bssid[6];
+ u8 ta[6];
+-} __packed;
++} __packed __aligned(2);
+
+ /* TDLS */
+
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
-@@ -187,6 +187,8 @@ static void ieee80211_send_addba_resp(st
+@@ -204,6 +204,8 @@ static void ieee80211_send_addba_resp(st
memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
else if (sdata->vif.type == NL80211_IFTYPE_STATION)
memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
-@@ -471,6 +472,7 @@ int ieee80211_start_tx_ba_session(struct
+@@ -527,6 +528,7 @@ int ieee80211_start_tx_ba_session(struct
sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
sdata->vif.type != NL80211_IFTYPE_AP &&
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
-@@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
+@@ -65,11 +65,11 @@ static ssize_t sta_flags_read(struct fil
test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
int res = scnprintf(buf, sizeof(buf),
-- "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
-+ "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+- "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
++ "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
TEST(PS_DRIVER), TEST(AUTHORIZED),
TEST(SHORT_PREAMBLE),
TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -178,7 +178,6 @@ static int ieee80211_do_open(struct net_
- {
- struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+@@ -107,7 +107,7 @@ void ieee80211_recalc_idle(struct ieee80
+
+ lockdep_assert_held(&local->mtx);
+
+- active = !list_empty(&local->chanctx_list);
++ active = !list_empty(&local->chanctx_list) || local->monitors;
+
+ if (!local->ops->remain_on_channel) {
+ list_for_each_entry(roc, &local->roc_list, list) {
+@@ -436,7 +436,6 @@ int ieee80211_do_open(struct wireless_de
+ struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
+ struct net_device *dev = wdev->netdev;
struct ieee80211_local *local = sdata->local;
- struct sta_info *sta;
u32 changed = 0;
int res;
u32 hw_reconf_flags = 0;
-@@ -309,28 +308,6 @@ static int ieee80211_do_open(struct net_
+@@ -541,6 +540,9 @@ int ieee80211_do_open(struct wireless_de
+
+ ieee80211_adjust_monitor_flags(sdata, 1);
+ ieee80211_configure_filter(local);
++ mutex_lock(&local->mtx);
++ ieee80211_recalc_idle(local);
++ mutex_unlock(&local->mtx);
+
+ netif_carrier_on(dev);
+ break;
+@@ -595,30 +597,8 @@ int ieee80211_do_open(struct wireless_de
set_bit(SDATA_STATE_RUNNING, &sdata->state);
- }
-
- rate_control_rate_init(sta);
+- netif_carrier_on(dev);
+- } else if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE) {
++ if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE)
+ rcu_assign_pointer(local->p2p_sdata, sdata);
- }
--
+
/*
* set_multicast_list will be invoked by the networking core
- * which will check whether any increments here were done in
-@@ -357,8 +334,7 @@ static int ieee80211_do_open(struct net_
- netif_tx_start_all_queues(dev);
+@@ -817,6 +797,9 @@ static void ieee80211_do_stop(struct iee
- return 0;
-- err_del_interface:
-- drv_remove_interface(local, sdata);
-+
- err_stop:
- if (!local->open_count)
- drv_stop(local);
-@@ -654,6 +630,8 @@ static void ieee80211_teardown_sdata(str
-
- if (ieee80211_vif_is_mesh(&sdata->vif))
- mesh_rmc_free(sdata);
-+ else if (sdata->vif.type == NL80211_IFTYPE_STATION)
-+ ieee80211_mgd_teardown(sdata);
-
- flushed = sta_info_flush(local, sdata);
- WARN_ON(flushed);
-@@ -720,6 +698,70 @@ static void ieee80211_if_setup(struct ne
+ ieee80211_adjust_monitor_flags(sdata, -1);
+ ieee80211_configure_filter(local);
++ mutex_lock(&local->mtx);
++ ieee80211_recalc_idle(local);
++ mutex_unlock(&local->mtx);
+ break;
+ case NL80211_IFTYPE_P2P_DEVICE:
+ /* relies on synchronize_rcu() below */
+@@ -1022,6 +1005,72 @@ static void ieee80211_if_setup(struct ne
dev->destructor = free_netdev;
}
+ ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
+ skb->len - baselen, &elems);
+
-+ rates = ieee80211_sta_get_rates(local, &elems, band);
++ rates = ieee80211_sta_get_rates(local, &elems, band, NULL);
+
+ rcu_read_lock();
+
+
+ if (elems.ht_cap_elem)
+ ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
-+ elems.ht_cap_elem, &sta->sta.ht_cap);
++ elems.ht_cap_elem, sta);
+
+ if (elems.wmm_param)
+ set_sta_flag(sta, WLAN_STA_WME);
+
+ if (new) {
-+ set_sta_flag(sta, WLAN_STA_AUTHORIZED);
++ sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
++ sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
++ sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
+ rate_control_rate_init(sta);
+ sta_info_insert_rcu(sta);
+ }
static void ieee80211_iface_work(struct work_struct *work)
{
struct ieee80211_sub_if_data *sdata =
-@@ -824,6 +866,9 @@ static void ieee80211_iface_work(struct
+@@ -1126,6 +1175,9 @@ static void ieee80211_iface_work(struct
break;
ieee80211_mesh_rx_queued_mgmt(sdata, skb);
break;
break;
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
-@@ -2281,6 +2281,7 @@ ieee80211_rx_h_action(struct ieee80211_r
+@@ -2365,6 +2365,7 @@ ieee80211_rx_h_action(struct ieee80211_r
sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
sdata->vif.type != NL80211_IFTYPE_AP &&
sdata->vif.type != NL80211_IFTYPE_ADHOC)
break;
-@@ -2491,14 +2492,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
+@@ -2692,14 +2693,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
if (!ieee80211_vif_is_mesh(&sdata->vif) &&
sdata->vif.type != NL80211_IFTYPE_ADHOC &&
break;
case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
-@@ -2852,10 +2854,16 @@ static int prepare_for_handlers(struct i
+@@ -3028,10 +3030,16 @@ static int prepare_for_handlers(struct i
}
break;
case NL80211_IFTYPE_WDS:
- if (bssid || !ieee80211_is_data(hdr->frame_control))
- return 0;
- if (compare_ether_addr(sdata->u.wds.remote_addr, hdr->addr2))
+ if (!ether_addr_equal(sdata->u.wds.remote_addr, hdr->addr2))
return 0;
+
+ if (ieee80211_is_data(hdr->frame_control) ||
+ return 0;
+
break;
- default:
- /* should never get here */
+ case NL80211_IFTYPE_P2P_DEVICE:
+ if (!ieee80211_is_public_action(hdr, skb->len) &&
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
-@@ -31,7 +31,6 @@
+@@ -32,7 +32,6 @@
* @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
* frames.
* @WLAN_STA_WME: Station is a QoS-STA.
* @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
* IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
* frame to this station is transmitted.
-@@ -62,7 +61,6 @@ enum ieee80211_sta_info_flags {
+@@ -66,7 +65,6 @@ enum ieee80211_sta_info_flags {
WLAN_STA_AUTHORIZED,
WLAN_STA_SHORT_PREAMBLE,
WLAN_STA_WME,
WLAN_STA_CLEAR_PS_FILT,
WLAN_STA_MFP,
WLAN_STA_BLOCK_BA,
---- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-@@ -530,7 +530,11 @@ int ath9k_hw_process_rxdesc_edma(struct
- */
- if (rxsp->status11 & AR_CRCErr)
- rxs->rs_status |= ATH9K_RXERR_CRC;
-- else if (rxsp->status11 & AR_PHYErr) {
-+ else if (rxsp->status11 & AR_DecryptCRCErr)
-+ rxs->rs_status |= ATH9K_RXERR_DECRYPT;
-+ else if (rxsp->status11 & AR_MichaelErr)
-+ rxs->rs_status |= ATH9K_RXERR_MIC;
-+ if (rxsp->status11 & AR_PHYErr) {
- phyerr = MS(rxsp->status11, AR_PHYErrCode);
- /*
- * If we reach a point here where AR_PostDelimCRCErr is
-@@ -552,11 +556,7 @@ int ath9k_hw_process_rxdesc_edma(struct
- rxs->rs_status |= ATH9K_RXERR_PHY;
- rxs->rs_phyerr = phyerr;
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -1231,34 +1231,40 @@ static bool ieee80211_tx_frags(struct ie
+ if (local->queue_stop_reasons[q] ||
+ (!txpending && !skb_queue_empty(&local->pending[q]))) {
+ if (unlikely(info->flags &
+- IEEE80211_TX_INTFL_OFFCHAN_TX_OK &&
+- local->queue_stop_reasons[q] &
+- ~BIT(IEEE80211_QUEUE_STOP_REASON_OFFCHANNEL))) {
++ IEEE80211_TX_INTFL_OFFCHAN_TX_OK)) {
++ if (local->queue_stop_reasons[q] &
++ ~BIT(IEEE80211_QUEUE_STOP_REASON_OFFCHANNEL)) {
++ /*
++ * Drop off-channel frames if queues
++ * are stopped for any reason other
++ * than off-channel operation. Never
++ * queue them.
++ */
++ spin_unlock_irqrestore(
++ &local->queue_stop_reason_lock,
++ flags);
++ ieee80211_purge_tx_queue(&local->hw,
++ skbs);
++ return true;
++ }
++ } else {
++
+ /*
+- * Drop off-channel frames if queues are stopped
+- * for any reason other than off-channel
+- * operation. Never queue them.
++ * Since queue is stopped, queue up frames for
++ * later transmission from the tx-pending
++ * tasklet when the queue is woken again.
+ */
+- spin_unlock_irqrestore(
+- &local->queue_stop_reason_lock, flags);
+- ieee80211_purge_tx_queue(&local->hw, skbs);
+- return true;
++ if (txpending)
++ skb_queue_splice_init(skbs,
++ &local->pending[q]);
++ else
++ skb_queue_splice_tail_init(skbs,
++ &local->pending[q]);
++
++ spin_unlock_irqrestore(&local->queue_stop_reason_lock,
++ flags);
++ return false;
}
-
-- } else if (rxsp->status11 & AR_DecryptCRCErr)
-- rxs->rs_status |= ATH9K_RXERR_DECRYPT;
-- else if (rxsp->status11 & AR_MichaelErr)
-- rxs->rs_status |= ATH9K_RXERR_MIC;
-+ };
+- /*
+- * Since queue is stopped, queue up frames for later
+- * transmission from the tx-pending tasklet when the
+- * queue is woken again.
+- */
+- if (txpending)
+- skb_queue_splice_init(skbs, &local->pending[q]);
+- else
+- skb_queue_splice_tail_init(skbs,
+- &local->pending[q]);
+-
+- spin_unlock_irqrestore(&local->queue_stop_reason_lock,
+- flags);
+- return false;
+ }
+ spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
+
+@@ -1848,9 +1854,24 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+ }
+
+ if (!is_multicast_ether_addr(skb->data)) {
++ struct sta_info *next_hop;
++ bool mpp_lookup = true;
++
+ mpath = mesh_path_lookup(sdata, skb->data);
+- if (!mpath)
++ if (mpath) {
++ mpp_lookup = false;
++ next_hop = rcu_dereference(mpath->next_hop);
++ if (!next_hop ||
++ !(mpath->flags & (MESH_PATH_ACTIVE |
++ MESH_PATH_RESOLVING)))
++ mpp_lookup = true;
++ }
++
++ if (mpp_lookup)
+ mppath = mpp_path_lookup(sdata, skb->data);
++
++ if (mppath && mpath)
++ mesh_path_del(mpath->sdata, mpath->dst);
+ }
+
+ /*
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -554,16 +554,9 @@ static int nl80211_msg_put_channel(struc
+ if ((chan->flags & IEEE80211_CHAN_NO_IBSS) &&
+ nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_IBSS))
+ goto nla_put_failure;
+- if (chan->flags & IEEE80211_CHAN_RADAR) {
+- u32 time = elapsed_jiffies_msecs(chan->dfs_state_entered);
+- if (nla_put_flag(msg, NL80211_FREQUENCY_ATTR_RADAR))
+- goto nla_put_failure;
+- if (nla_put_u32(msg, NL80211_FREQUENCY_ATTR_DFS_STATE,
+- chan->dfs_state))
+- goto nla_put_failure;
+- if (nla_put_u32(msg, NL80211_FREQUENCY_ATTR_DFS_TIME, time))
+- goto nla_put_failure;
+- }
++ if ((chan->flags & IEEE80211_CHAN_RADAR) &&
++ nla_put_flag(msg, NL80211_FREQUENCY_ATTR_RADAR))
++ goto nla_put_failure;
+ if ((chan->flags & IEEE80211_CHAN_NO_HT40MINUS) &&
+ nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_HT40_MINUS))
+ goto nla_put_failure;
+@@ -900,9 +893,6 @@ static int nl80211_put_iface_combination
+ nla_put_u32(msg, NL80211_IFACE_COMB_MAXNUM,
+ c->max_interfaces))
+ goto nla_put_failure;
+- if (nla_put_u32(msg, NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,
+- c->radar_detect_widths))
+- goto nla_put_failure;
+
+ nla_nest_end(msg, nl_combi);
}
+@@ -914,48 +904,6 @@ nla_put_failure:
+ return -ENOBUFS;
+ }
- if (rxsp->status11 & AR_KeyMiss)
---- a/drivers/net/wireless/ath/carl9170/tx.c
-+++ b/drivers/net/wireless/ath/carl9170/tx.c
-@@ -1236,6 +1236,7 @@ static bool carl9170_tx_ps_drop(struct a
+-#ifdef CONFIG_PM
+-static int nl80211_send_wowlan_tcp_caps(struct cfg80211_registered_device *rdev,
+- struct sk_buff *msg)
+-{
+- const struct wiphy_wowlan_tcp_support *tcp = rdev->wiphy.wowlan.tcp;
+- struct nlattr *nl_tcp;
+-
+- if (!tcp)
+- return 0;
+-
+- nl_tcp = nla_nest_start(msg, NL80211_WOWLAN_TRIG_TCP_CONNECTION);
+- if (!nl_tcp)
+- return -ENOBUFS;
+-
+- if (nla_put_u32(msg, NL80211_WOWLAN_TCP_DATA_PAYLOAD,
+- tcp->data_payload_max))
+- return -ENOBUFS;
+-
+- if (nla_put_u32(msg, NL80211_WOWLAN_TCP_DATA_PAYLOAD,
+- tcp->data_payload_max))
+- return -ENOBUFS;
+-
+- if (tcp->seq && nla_put_flag(msg, NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ))
+- return -ENOBUFS;
+-
+- if (tcp->tok && nla_put(msg, NL80211_WOWLAN_TCP_DATA_PAYLOAD_TOKEN,
+- sizeof(*tcp->tok), tcp->tok))
+- return -ENOBUFS;
+-
+- if (nla_put_u32(msg, NL80211_WOWLAN_TCP_DATA_INTERVAL,
+- tcp->data_interval_max))
+- return -ENOBUFS;
+-
+- if (nla_put_u32(msg, NL80211_WOWLAN_TCP_WAKE_PAYLOAD,
+- tcp->wake_payload_max))
+- return -ENOBUFS;
+-
+- nla_nest_end(msg, nl_tcp);
+- return 0;
+-}
+-#endif
+-
+ static int nl80211_send_wiphy(struct sk_buff *msg, u32 portid, u32 seq, int flags,
+ struct cfg80211_registered_device *dev)
{
- struct ieee80211_sta *sta;
- struct carl9170_sta_info *sta_info;
-+ struct ieee80211_tx_info *tx_info;
+@@ -1330,9 +1278,6 @@ static int nl80211_send_wiphy(struct sk_
+ goto nla_put_failure;
+ }
+
+- if (nl80211_send_wowlan_tcp_caps(dev, msg))
+- goto nla_put_failure;
+-
+ nla_nest_end(msg, nl_wowlan);
+ }
+ #endif
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -3285,13 +3285,19 @@ static int ieee80211_cfg_get_channel(str
+ struct cfg80211_chan_def *chandef)
+ {
+ struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
++ struct ieee80211_local *local = wiphy_priv(wiphy);
+ struct ieee80211_chanctx_conf *chanctx_conf;
+ int ret = -ENODATA;
rcu_read_lock();
- sta = __carl9170_get_tx_sta(ar, skb);
-@@ -1243,12 +1244,13 @@ static bool carl9170_tx_ps_drop(struct a
- goto out_rcu;
-
- sta_info = (void *) sta->drv_priv;
-- if (unlikely(sta_info->sleeping)) {
-- struct ieee80211_tx_info *tx_info;
-+ tx_info = IEEE80211_SKB_CB(skb);
-
-+ if (unlikely(sta_info->sleeping) &&
-+ !(tx_info->flags & (IEEE80211_TX_CTL_NO_PS_BUFFER |
-+ IEEE80211_TX_CTL_CLEAR_PS_FILT))) {
- rcu_read_unlock();
-
-- tx_info = IEEE80211_SKB_CB(skb);
- if (tx_info->flags & IEEE80211_TX_CTL_AMPDU)
- atomic_dec(&ar->tx_ampdu_upload);
-
---- a/drivers/net/wireless/iwlegacy/4965-mac.c
-+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
-@@ -1694,7 +1694,7 @@ il4965_tx_skb(struct il_priv *il, struct
- sta_priv = (void *)sta->drv_priv;
-
- if (sta_priv && sta_priv->asleep &&
-- (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)) {
-+ (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)) {
- /*
- * This sends an asynchronous command to the device,
- * but we can rely on it being processed before the
---- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
-@@ -322,7 +322,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
- sta_priv = (void *)info->control.sta->drv_priv;
-
- if (sta_priv && sta_priv->asleep &&
-- (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)) {
-+ (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)) {
- /*
- * This sends an asynchronous command to the device,
- * but we can rely on it being processed before the
-@@ -331,6 +331,10 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
- * counter.
- * For now set the counter to just 1 since we do not
- * support uAPSD yet.
-+ *
-+ * FIXME: If we get two non-bufferable frames one
-+ * after the other, we might only send out one of
-+ * them because this is racy.
- */
- iwl_sta_modify_sleep_tx_count(priv, sta_id, 1);
+- chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
+- if (chanctx_conf) {
+- *chandef = chanctx_conf->def;
++ if (local->use_chanctx) {
++ chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
++ if (chanctx_conf) {
++ *chandef = chanctx_conf->def;
++ ret = 0;
++ }
++ } else if (local->open_count == local->monitors) {
++ *chandef = local->monitor_chandef;
+ ret = 0;
}
---- a/drivers/net/wireless/p54/txrx.c
-+++ b/drivers/net/wireless/p54/txrx.c
-@@ -690,7 +690,7 @@ static void p54_tx_80211_header(struct p
- if (!(info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ))
- *flags |= P54_HDR_FLAG_DATA_OUT_SEQNR;
-
-- if (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)
-+ if (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)
- *flags |= P54_HDR_FLAG_DATA_OUT_NOCANCEL;
-
- if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
---- a/include/net/mac80211.h
-+++ b/include/net/mac80211.h
-@@ -341,9 +341,9 @@ struct ieee80211_bss_conf {
- * used to indicate that a frame was already retried due to PS
- * @IEEE80211_TX_INTFL_DONT_ENCRYPT: completely internal to mac80211,
- * used to indicate frame should not be encrypted
-- * @IEEE80211_TX_CTL_POLL_RESPONSE: This frame is a response to a poll
-- * frame (PS-Poll or uAPSD) and should be sent although the station
-- * is in powersave mode.
-+ * @IEEE80211_TX_CTL_NO_PS_BUFFER: This frame is a response to a poll
-+ * frame (PS-Poll or uAPSD) or a non-bufferable MMPDU and must
-+ * be sent although the station is in powersave mode.
- * @IEEE80211_TX_CTL_MORE_FRAMES: More frames will be passed to the
- * transmit function after the current frame, this can be used
- * by drivers to kick the DMA queue only if unset or when the
-@@ -399,7 +399,7 @@ enum mac80211_tx_control_flags {
- IEEE80211_TX_INTFL_NEED_TXPROCESSING = BIT(14),
- IEEE80211_TX_INTFL_RETRIED = BIT(15),
- IEEE80211_TX_INTFL_DONT_ENCRYPT = BIT(16),
-- IEEE80211_TX_CTL_POLL_RESPONSE = BIT(17),
-+ IEEE80211_TX_CTL_NO_PS_BUFFER = BIT(17),
- IEEE80211_TX_CTL_MORE_FRAMES = BIT(18),
- IEEE80211_TX_INTFL_RETRANSMISSION = BIT(19),
- /* hole at 20, use later */
-@@ -425,7 +425,7 @@ enum mac80211_tx_control_flags {
- IEEE80211_TX_CTL_SEND_AFTER_DTIM | IEEE80211_TX_CTL_AMPDU | \
- IEEE80211_TX_STAT_TX_FILTERED | IEEE80211_TX_STAT_ACK | \
- IEEE80211_TX_STAT_AMPDU | IEEE80211_TX_STAT_AMPDU_NO_BACK | \
-- IEEE80211_TX_CTL_RATE_CTRL_PROBE | IEEE80211_TX_CTL_POLL_RESPONSE | \
-+ IEEE80211_TX_CTL_RATE_CTRL_PROBE | IEEE80211_TX_CTL_NO_PS_BUFFER | \
- IEEE80211_TX_CTL_MORE_FRAMES | IEEE80211_TX_CTL_LDPC | \
- IEEE80211_TX_CTL_STBC | IEEE80211_TX_STATUS_EOSP)
-
-@@ -1634,7 +1634,7 @@ void ieee80211_free_txskb(struct ieee802
- * the station sends a PS-Poll or a uAPSD trigger frame, mac80211
- * will inform the driver of this with the @allow_buffered_frames
- * callback; this callback is optional. mac80211 will then transmit
-- * the frames as usual and set the %IEEE80211_TX_CTL_POLL_RESPONSE
-+ * the frames as usual and set the %IEEE80211_TX_CTL_NO_PS_BUFFER
- * on each frame. The last frame in the service period (or the only
- * response to a PS-Poll) also has %IEEE80211_TX_STATUS_EOSP set to
- * indicate that it ends the service period; as this frame must have
-@@ -1642,6 +1642,9 @@ void ieee80211_free_txskb(struct ieee802
- * When TX status is reported for this frame, the service period is
- * marked has having ended and a new one can be started by the peer.
- *
-+ * Additionally, non-bufferable MMPDUs can also be transmitted by
-+ * mac80211 with the %IEEE80211_TX_CTL_NO_PS_BUFFER set in them.
-+ *
- * Another race condition can happen on some devices like iwlwifi
- * when there are frames queued for the station and it wakes up
- * or polls; the frames that are already queued could end up being
-@@ -2140,7 +2143,7 @@ enum ieee80211_frame_release_type {
- * @allow_buffered_frames: Prepare device to allow the given number of frames
- * to go out to the given station. The frames will be sent by mac80211
- * via the usual TX path after this call. The TX information for frames
-- * released will also have the %IEEE80211_TX_CTL_POLL_RESPONSE flag set
-+ * released will also have the %IEEE80211_TX_CTL_NO_PS_BUFFER flag set
- * and the last one will also have %IEEE80211_TX_STATUS_EOSP set. In case
- * frames from multiple TIDs are released and the driver might reorder
- * them between the TIDs, it must set the %IEEE80211_TX_STATUS_EOSP flag
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -1183,6 +1183,7 @@ void ieee80211_sta_rx_queued_mgmt(struct
- struct sk_buff *skb);
- void ieee80211_sta_reset_beacon_monitor(struct ieee80211_sub_if_data *sdata);
- void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata);
-+void ieee80211_mgd_teardown(struct ieee80211_sub_if_data *sdata);
-
- /* IBSS code */
- void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local);
---- a/net/mac80211/mlme.c
-+++ b/net/mac80211/mlme.c
-@@ -3496,6 +3496,19 @@ int ieee80211_mgd_disassoc(struct ieee80
- return 0;
+ rcu_read_unlock();
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -1463,7 +1463,9 @@ static bool ath9k_hw_chip_reset(struct a
+ reset_type = ATH9K_RESET_POWER_ON;
+ else
+ reset_type = ATH9K_RESET_COLD;
+- }
++ } else if (ah->chip_fullsleep || REG_READ(ah, AR_Q_TXE) ||
++ (REG_READ(ah, AR_CR) & AR_CR_RXE))
++ reset_type = ATH9K_RESET_COLD;
+
+ if (!ath9k_hw_set_reset_reg(ah, reset_type))
+ return false;
+--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
++++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
+@@ -1236,8 +1236,10 @@ static inline void rt2x00lib_set_if_comb
+ */
+ if_limit = &rt2x00dev->if_limits_ap;
+ if_limit->max = rt2x00dev->ops->max_ap_intf;
+- if_limit->types = BIT(NL80211_IFTYPE_AP) |
+- BIT(NL80211_IFTYPE_MESH_POINT);
++ if_limit->types = BIT(NL80211_IFTYPE_AP);
++#ifdef CONFIG_MAC80211_MESH
++ if_limit->types |= BIT(NL80211_IFTYPE_MESH_POINT);
++#endif
+
+ /*
+ * Build up AP interface combinations structure.
+@@ -1309,7 +1311,9 @@ int rt2x00lib_probe_dev(struct rt2x00_de
+ rt2x00dev->hw->wiphy->interface_modes |=
+ BIT(NL80211_IFTYPE_ADHOC) |
+ BIT(NL80211_IFTYPE_AP) |
++#ifdef CONFIG_MAC80211_MESH
+ BIT(NL80211_IFTYPE_MESH_POINT) |
++#endif
+ BIT(NL80211_IFTYPE_WDS);
+
+ rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -26,11 +26,11 @@
+ /* Number of symbols for a packet with (bps) bits per symbol */
+ #define MCS_NSYMS(bps) ((MCS_NBITS + (bps) - 1) / (bps))
+
+-/* Transmission time for a packet containing (syms) symbols */
++/* Transmission time (nanoseconds) for a packet containing (syms) symbols */
+ #define MCS_SYMBOL_TIME(sgi, syms) \
+ (sgi ? \
+- ((syms) * 18 + 4) / 5 : /* syms * 3.6 us */ \
+- (syms) << 2 /* syms * 4 us */ \
++ ((syms) * 18000 + 4000) / 5 : /* syms * 3.6 us */ \
++ ((syms) * 1000) << 2 /* syms * 4 us */ \
+ )
+
+ /* Transmit duration for the raw data part of an average sized packet */
+@@ -64,9 +64,9 @@
}
-+void ieee80211_mgd_teardown(struct ieee80211_sub_if_data *sdata)
-+{
-+ struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+ #define CCK_DURATION(_bitrate, _short, _len) \
+- (10 /* SIFS */ + \
++ (1000 * (10 /* SIFS */ + \
+ (_short ? 72 + 24 : 144 + 48 ) + \
+- (8 * (_len + 4) * 10) / (_bitrate))
++ (8 * (_len + 4) * 10) / (_bitrate)))
+
+ #define CCK_ACK_DURATION(_bitrate, _short) \
+ (CCK_DURATION((_bitrate > 10 ? 20 : 10), false, 60) + \
+@@ -211,7 +211,8 @@ static void
+ minstrel_ht_calc_tp(struct minstrel_ht_sta *mi, int group, int rate)
+ {
+ struct minstrel_rate_stats *mr;
+- unsigned int usecs = 0;
++ unsigned int nsecs = 0;
++ unsigned int tp;
+
+ mr = &mi->groups[group].rates[rate];
+
+@@ -221,10 +222,12 @@ minstrel_ht_calc_tp(struct minstrel_ht_s
+ }
+
+ if (group != MINSTREL_CCK_GROUP)
+- usecs = mi->overhead / MINSTREL_TRUNC(mi->avg_ampdu_len);
++ nsecs = 1000 * mi->overhead / MINSTREL_TRUNC(mi->avg_ampdu_len);
+
+- usecs += minstrel_mcs_groups[group].duration[rate];
+- mr->cur_tp = MINSTREL_TRUNC((1000000 / usecs) * mr->probability);
++ nsecs += minstrel_mcs_groups[group].duration[rate];
++ tp = 1000000 * ((mr->probability * 1000) / nsecs);
+
-+ mutex_lock(&ifmgd->mtx);
-+ if (ifmgd->assoc_data)
-+ ieee80211_destroy_assoc_data(sdata, false);
-+ if (ifmgd->auth_data)
-+ ieee80211_destroy_auth_data(sdata, false);
-+ del_timer_sync(&ifmgd->timer);
-+ mutex_unlock(&ifmgd->mtx);
-+}
++ mr->cur_tp = MINSTREL_TRUNC(tp);
+ }
+
+ /*
+@@ -308,8 +311,8 @@ minstrel_ht_update_stats(struct minstrel
+ }
+ }
+
+- /* try to sample up to half of the available rates during each interval */
+- mi->sample_count *= 4;
++ /* try to sample all available rates during each interval */
++ mi->sample_count *= 8;
+
+ cur_prob = 0;
+ cur_prob_tp = 0;
+@@ -320,20 +323,13 @@ minstrel_ht_update_stats(struct minstrel
+ if (!mg->supported)
+ continue;
+
+- mr = minstrel_get_ratestats(mi, mg->max_prob_rate);
+- if (cur_prob_tp < mr->cur_tp &&
+- minstrel_mcs_groups[group].streams == 1) {
+- mi->max_prob_rate = mg->max_prob_rate;
+- cur_prob = mr->cur_prob;
+- cur_prob_tp = mr->cur_tp;
+- }
+-
+ mr = minstrel_get_ratestats(mi, mg->max_tp_rate);
+ if (cur_tp < mr->cur_tp) {
+ mi->max_tp_rate2 = mi->max_tp_rate;
+ cur_tp2 = cur_tp;
+ mi->max_tp_rate = mg->max_tp_rate;
+ cur_tp = mr->cur_tp;
++ mi->max_prob_streams = minstrel_mcs_groups[group].streams - 1;
+ }
+
+ mr = minstrel_get_ratestats(mi, mg->max_tp_rate2);
+@@ -343,6 +339,23 @@ minstrel_ht_update_stats(struct minstrel
+ }
+ }
+
++ if (mi->max_prob_streams < 1)
++ mi->max_prob_streams = 1;
+
- void ieee80211_cqm_rssi_notify(struct ieee80211_vif *vif,
- enum nl80211_cqm_rssi_threshold_event rssi_event,
- gfp_t gfp)
---- a/net/mac80211/sta_info.c
-+++ b/net/mac80211/sta_info.c
-@@ -865,8 +865,10 @@ int sta_info_flush(struct ieee80211_loca
-
- mutex_lock(&local->sta_mtx);
- list_for_each_entry_safe(sta, tmp, &local->sta_list, list) {
-- if (!sdata || sdata == sta->sdata)
-+ if (!sdata || sdata == sta->sdata) {
- WARN_ON(__sta_info_destroy(sta));
-+ ret++;
++ for (group = 0; group < ARRAY_SIZE(minstrel_mcs_groups); group++) {
++ mg = &mi->groups[group];
++ if (!mg->supported)
++ continue;
++ mr = minstrel_get_ratestats(mi, mg->max_prob_rate);
++ if (cur_prob_tp < mr->cur_tp &&
++ minstrel_mcs_groups[group].streams <= mi->max_prob_streams) {
++ mi->max_prob_rate = mg->max_prob_rate;
++ cur_prob = mr->cur_prob;
++ cur_prob_tp = mr->cur_tp;
+ }
++ }
++
++
+ mi->stats_update = jiffies;
+ }
+
+@@ -467,7 +480,7 @@ minstrel_ht_tx_status(void *priv, struct
+
+ if (!mi->sample_wait && !mi->sample_tries && mi->sample_count > 0) {
+ mi->sample_wait = 16 + 2 * MINSTREL_TRUNC(mi->avg_ampdu_len);
+- mi->sample_tries = 2;
++ mi->sample_tries = 1;
+ mi->sample_count--;
}
- mutex_unlock(&local->sta_mtx);
-@@ -1048,7 +1050,7 @@ static void ieee80211_send_null_response
- * exchange. Also set EOSP to indicate this packet
- * ends the poll/service period.
+@@ -536,7 +549,7 @@ minstrel_calc_retransmit(struct minstrel
+ mr->retry_updated = true;
+
+ group = &minstrel_mcs_groups[index / MCS_GROUP_RATES];
+- tx_time_data = group->duration[index % MCS_GROUP_RATES] * ampdu_len;
++ tx_time_data = group->duration[index % MCS_GROUP_RATES] * ampdu_len / 1000;
+
+ /* Contention time for first 2 tries */
+ ctime = (t_slot * cw) >> 1;
+@@ -616,6 +629,7 @@ minstrel_get_sample_rate(struct minstrel
+ {
+ struct minstrel_rate_stats *mr;
+ struct minstrel_mcs_group_data *mg;
++ unsigned int sample_dur, sample_group;
+ int sample_idx = 0;
+
+ if (mi->sample_wait > 0) {
+@@ -626,11 +640,11 @@ minstrel_get_sample_rate(struct minstrel
+ if (!mi->sample_tries)
+ return -1;
+
+- mi->sample_tries--;
+ mg = &mi->groups[mi->sample_group];
+ sample_idx = sample_table[mg->column][mg->index];
+ mr = &mg->rates[sample_idx];
+- sample_idx += mi->sample_group * MCS_GROUP_RATES;
++ sample_group = mi->sample_group;
++ sample_idx += sample_group * MCS_GROUP_RATES;
+ minstrel_next_sample_idx(mi);
+
+ /*
+@@ -651,14 +665,18 @@ minstrel_get_sample_rate(struct minstrel
+ * Make sure that lower rates get sampled only occasionally,
+ * if the link is working perfectly.
*/
-- info->flags |= IEEE80211_TX_CTL_POLL_RESPONSE |
-+ info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER |
- IEEE80211_TX_STATUS_EOSP |
- IEEE80211_TX_CTL_REQ_TX_STATUS;
-
-@@ -1175,7 +1177,7 @@ ieee80211_sta_ps_deliver_response(struct
- * STA may still remain is PS mode after this frame
- * exchange.
- */
-- info->flags |= IEEE80211_TX_CTL_POLL_RESPONSE;
-+ info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
-
- /*
- * Use MoreData flag to indicate whether there are
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -448,18 +448,23 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
- struct ieee80211_local *local = tx->local;
-
-- if (unlikely(!sta ||
-- ieee80211_is_probe_resp(hdr->frame_control) ||
-- ieee80211_is_auth(hdr->frame_control) ||
-- ieee80211_is_assoc_resp(hdr->frame_control) ||
-- ieee80211_is_reassoc_resp(hdr->frame_control)))
-+ if (unlikely(!sta))
- return TX_CONTINUE;
-
- if (unlikely((test_sta_flag(sta, WLAN_STA_PS_STA) ||
- test_sta_flag(sta, WLAN_STA_PS_DRIVER)) &&
-- !(info->flags & IEEE80211_TX_CTL_POLL_RESPONSE))) {
-+ !(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER))) {
- int ac = skb_get_queue_mapping(tx->skb);
-
-+ /* only deauth, disassoc and action are bufferable MMPDUs */
-+ if (ieee80211_is_mgmt(hdr->frame_control) &&
-+ !ieee80211_is_deauth(hdr->frame_control) &&
-+ !ieee80211_is_disassoc(hdr->frame_control) &&
-+ !ieee80211_is_action(hdr->frame_control)) {
-+ info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
-+ return TX_CONTINUE;
-+ }
+- if (minstrel_get_duration(sample_idx) >
+- minstrel_get_duration(mi->max_tp_rate)) {
++ sample_dur = minstrel_get_duration(sample_idx);
++ if (sample_dur >= minstrel_get_duration(mi->max_tp_rate2) &&
++ (mi->max_prob_streams <
++ minstrel_mcs_groups[sample_group].streams ||
++ sample_dur >= minstrel_get_duration(mi->max_prob_rate))) {
+ if (mr->sample_skipped < 20)
+ return -1;
+
+ if (mi->sample_slow++ > 2)
+ return -1;
+ }
++ mi->sample_tries--;
+
+ return sample_idx;
+ }
+--- a/net/mac80211/rc80211_minstrel_ht.h
++++ b/net/mac80211/rc80211_minstrel_ht.h
+@@ -85,6 +85,7 @@ struct minstrel_ht_sta {
+
+ /* best probability rate */
+ unsigned int max_prob_rate;
++ unsigned int max_prob_streams;
+
+ /* time of last status update */
+ unsigned long stats_update;
+--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+@@ -1023,6 +1023,7 @@ static bool ar9003_hw_init_cal(struct at
+ AR_PHY_AGC_CONTROL_FLTR_CAL |
+ AR_PHY_AGC_CONTROL_PKDET_CAL;
+
++ /* Use chip chainmask only for calibration */
+ ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);
+
+ if (rtt) {
+@@ -1150,6 +1151,9 @@ skip_tx_iqcal:
+ ar9003_hw_rtt_disable(ah);
+ }
+
++ /* Revert chainmask to runtime parameters */
++ ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
+
- #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
- printk(KERN_DEBUG "STA %pM aid %d: PS buffer for AC %d\n",
- sta->sta.addr, sta->sta.aid, ac);
+ /* Initialize list pointers */
+ ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;
+
+--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+@@ -3606,6 +3606,12 @@ static void ar9003_hw_ant_ctrl_apply(str
+ value = ar9003_hw_ant_ctrl_common_2_get(ah, is2ghz);
+ REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM_2, AR_SWITCH_TABLE_COM2_ALL, value);
+
++ if ((AR_SREV_9462(ah)) && (ah->rxchainmask == 0x2)) {
++ value = ar9003_hw_ant_ctrl_chain_get(ah, 1, is2ghz);
++ REG_RMW_FIELD(ah, switch_chain_reg[0],
++ AR_SWITCH_TABLE_ALL, value);
++ }
++
+ for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
+ if ((ah->rxchainmask & BIT(chain)) ||
+ (ah->txchainmask & BIT(chain))) {
+@@ -3772,6 +3778,17 @@ static void ar9003_hw_atten_apply(struct
+ AR_PHY_EXT_ATTEN_CTL_2,
+ };
+
++ if ((AR_SREV_9462(ah)) && (ah->rxchainmask == 0x2)) {
++ value = ar9003_hw_atten_chain_get(ah, 1, chan);
++ REG_RMW_FIELD(ah, ext_atten_reg[0],
++ AR_PHY_EXT_ATTEN_CTL_XATTEN1_DB, value);
++
++ value = ar9003_hw_atten_chain_get_margin(ah, 1, chan);
++ REG_RMW_FIELD(ah, ext_atten_reg[0],
++ AR_PHY_EXT_ATTEN_CTL_XATTEN1_MARGIN,
++ value);
++ }
++
+ /* Test value. if 0 then attenuation is unused. Don't load anything. */
+ for (i = 0; i < 3; i++) {
+ if (ah->txchainmask & BIT(i)) {
+--- a/drivers/net/wireless/ath/ath9k/link.c
++++ b/drivers/net/wireless/ath/ath9k/link.c
+@@ -28,21 +28,21 @@ void ath_tx_complete_poll_work(struct wo
+ int i;
+ bool needreset = false;
+
+- for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
+- if (ATH_TXQ_SETUP(sc, i)) {
+- txq = &sc->tx.txq[i];
+- ath_txq_lock(sc, txq);
+- if (txq->axq_depth) {
+- if (txq->axq_tx_inprogress) {
+- needreset = true;
+- ath_txq_unlock(sc, txq);
+- break;
+- } else {
+- txq->axq_tx_inprogress = true;
+- }
++ for (i = 0; i < IEEE80211_NUM_ACS; i++) {
++ txq = sc->tx.txq_map[i];
++
++ ath_txq_lock(sc, txq);
++ if (txq->axq_depth) {
++ if (txq->axq_tx_inprogress) {
++ needreset = true;
++ ath_txq_unlock(sc, txq);
++ break;
++ } else {
++ txq->axq_tx_inprogress = true;
+ }
+- ath_txq_unlock_complete(sc, txq);
+ }
++ ath_txq_unlock_complete(sc, txq);
++ }
+
+ if (needreset) {
+ ath_dbg(ath9k_hw_common(sc->sc_ah), RESET,
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -766,6 +766,7 @@ int __must_check __sta_info_destroy(stru
+ struct ieee80211_local *local;
+ struct ieee80211_sub_if_data *sdata;
+ int ret, i;
++ bool have_key = false;
+
+ might_sleep();
+
+@@ -793,12 +794,19 @@ int __must_check __sta_info_destroy(stru
+ list_del_rcu(&sta->list);
+
+ mutex_lock(&local->key_mtx);
+- for (i = 0; i < NUM_DEFAULT_KEYS; i++)
++ for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
+ __ieee80211_key_free(key_mtx_dereference(local, sta->gtk[i]));
+- if (sta->ptk)
++ have_key = true;
++ }
++ if (sta->ptk) {
+ __ieee80211_key_free(key_mtx_dereference(local, sta->ptk));
++ have_key = true;
++ }
+ mutex_unlock(&local->key_mtx);
+
++ if (!have_key)
++ synchronize_net();
++
+ sta->dead = true;
+
+ local->num_sta--;
projects / openwrt / svn-archive / archive.git / blobdiff