Merge tag 'wireless-drivers-next-for-davem-2015-06-18' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
Major changes:

mwifiex:

* enhancements for AP mode: support verbose information in station
  dump command and also information about AP link.
* enable power save by default

brcmfmac:

* fix module reload issue for PCIe
* improving msgbuf protocol for PCIe devices
* rework .get_station() cfg80211 callback operation
* determine interface combinations upon device feature support

ath9k:

* ath9k_htc: add support of channel switch

wil6210:

* add modparam for bcast ring size
* support hidden SSID
* add per-MCS Rx stats
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

14 files changed, 63 insertions, 111 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
index d930c1f78721..ce4da9d79fbd 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
@@ -1123,23 +1123,22 @@ static void rtl88e_dm_init_txpower_tracking(struct ieee80211_hw *hw)
 void rtl88e_dm_check_txpower_tracking(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        static u8 tm_trigger;
 
         if (!rtlpriv->dm.txpower_tracking)
                 return;
 
-        if (!tm_trigger) {
+        if (!rtlpriv->dm.tm_trigger) {
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, BIT(17)|BIT(16),
                               0x03);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Trigger 88E Thermal Meter!!\n");
-                tm_trigger = 1;
+                rtlpriv->dm.tm_trigger = 1;
                 return;
         } else {
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Schedule TxPowerTracking !!\n");
                                 dm_txpower_track_cb_therm(hw);
-                tm_trigger = 0;
+                rtlpriv->dm.tm_trigger = 0;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index f5ee67cda73a..0aca6f47487c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -1169,23 +1169,22 @@ static void rtl92c_dm_check_txpower_tracking_thermal_meter(
                                                 struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        static u8 tm_trigger;
 
         if (!rtlpriv->dm.txpower_tracking)
                 return;
 
-        if (!tm_trigger) {
+        if (!rtlpriv->dm.tm_trigger) {
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, RFREG_OFFSET_MASK,
                               0x60);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Trigger 92S Thermal Meter!!\n");
-                tm_trigger = 1;
+                rtlpriv->dm.tm_trigger = 1;
                 return;
         } else {
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Schedule TxPowerTracking direct call!!\n");
                 rtl92c_dm_txpower_tracking_directcall(hw);
-                tm_trigger = 0;
+                rtlpriv->dm.tm_trigger = 0;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index 29983bc96a89..14b819ea8b71 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -233,13 +233,14 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
         pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
         pfwdata = (u8 *)rtlhal->pfirmware;
         fwsize = rtlhal->fwsize;
-
         if (IS_FW_HEADER_EXIST(pfwheader)) {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
                          "Firmware Version(%d), Signature(%#x),Size(%d)\n",
                           pfwheader->version, pfwheader->signature,
                           (int)sizeof(struct rtl92c_firmware_header));
 
+                rtlhal->fw_version = pfwheader->version;
+                rtlhal->fw_subversion = pfwheader->subversion;
                 pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
                 fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 189859617db8..767358a553fb 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -840,6 +840,26 @@ static void _rtl92cu_init_wmac_setting(struct ieee80211_hw *hw)
         rtl92c_set_data_filter(hw, value16);
 }
 
+static void _rtl92cu_init_beacon_parameters(struct ieee80211_hw *hw)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+
+        rtl_write_word(rtlpriv, REG_BCN_CTRL, 0x1010);
+
+        /* TODO: Remove these magic number */
+        rtl_write_word(rtlpriv, REG_TBTT_PROHIBIT, 0x6404);
+        rtl_write_byte(rtlpriv, REG_DRVERLYINT, DRIVER_EARLY_INT_TIME);
+        rtl_write_byte(rtlpriv, REG_BCNDMATIM, BCN_DMA_ATIME_INT_TIME);
+        /* Change beacon AIFS to the largest number
+         * beacause test chip does not contension before sending beacon.
+         */
+        if (IS_NORMAL_CHIP(rtlhal->version))
+                rtl_write_word(rtlpriv, REG_BCNTCFG, 0x660F);
+        else
+                rtl_write_word(rtlpriv, REG_BCNTCFG, 0x66FF);
+}
+
 static int _rtl92cu_init_mac(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -887,7 +907,7 @@ static int _rtl92cu_init_mac(struct ieee80211_hw *hw)
         _rtl92cu_init_usb_aggregation(hw);
         rtlpriv->cfg->ops->set_bw_mode(hw, NL80211_CHAN_HT20);
         rtl92c_set_min_space(hw, IS_92C_SERIAL(rtlhal->version));
-        rtl92c_init_beacon_parameters(hw, rtlhal->version);
+        _rtl92cu_init_beacon_parameters(hw);
         rtl92c_init_ampdu_aggregation(hw);
         rtl92c_init_beacon_max_error(hw);
         return err;
@@ -987,7 +1007,6 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw)
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         int err = 0;
-        static bool iqk_initialized;
         unsigned long flags;
 
         /* As this function can take a very long time (up to 350 ms)
@@ -1038,11 +1057,11 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw)
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ETHER_ADDR, mac->mac_addr);
         if (ppsc->rfpwr_state == ERFON) {
                 rtl92c_phy_set_rfpath_switch(hw, 1);
-                if (iqk_initialized) {
+                if (rtlphy->iqk_initialized) {
                         rtl92c_phy_iq_calibrate(hw, true);
                 } else {
                         rtl92c_phy_iq_calibrate(hw, false);
-                        iqk_initialized = true;
+                        rtlphy->iqk_initialized = true;
                 }
                 rtl92c_dm_check_txpower_tracking(hw);
                 rtl92c_phy_lc_calibrate(hw);
@@ -1391,6 +1410,9 @@ void rtl92cu_card_disable(struct ieee80211_hw *hw)
                 _CardDisableHWSM(hw);
         else
                 _CardDisableWithoutHWSM(hw);
+
+        /* after power off we should do iqk again */
+        rtlpriv->phy.iqk_initialized = false;
 }
 
 void rtl92cu_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
@@ -1451,25 +1473,6 @@ int rtl92cu_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type)
         return 0;
 }
 
-static void _InitBeaconParameters(struct ieee80211_hw *hw)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
-
-        rtl_write_word(rtlpriv, REG_BCN_CTRL, 0x1010);
-
-        /* TODO: Remove these magic number */
-        rtl_write_word(rtlpriv, REG_TBTT_PROHIBIT, 0x6404);
-        rtl_write_byte(rtlpriv, REG_DRVERLYINT, DRIVER_EARLY_INT_TIME);
-        rtl_write_byte(rtlpriv, REG_BCNDMATIM, BCN_DMA_ATIME_INT_TIME);
-        /* Change beacon AIFS to the largest number
-         * beacause test chip does not contension before sending beacon. */
-        if (IS_NORMAL_CHIP(rtlhal->version))
-                rtl_write_word(rtlpriv, REG_BCNTCFG, 0x660F);
-        else
-                rtl_write_word(rtlpriv, REG_BCNTCFG, 0x66FF);
-}
-
 static void _beacon_function_enable(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -1490,7 +1493,7 @@ void rtl92cu_set_beacon_related_registers(struct ieee80211_hw *hw)
         atim_window = 2;        /*FIX MERGE */
         rtl_write_word(rtlpriv, REG_ATIMWND, atim_window);
         rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
-        _InitBeaconParameters(hw);
+        _rtl92cu_init_beacon_parameters(hw);
         rtl_write_byte(rtlpriv, REG_SLOT, 0x09);
         /*
          * Force beacon frame transmission even after receiving beacon frame
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
index f3db6bc8596a..490a7cf7c702 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
@@ -641,21 +641,6 @@ void rtl92c_init_retry_function(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_ACKTO, 0x40);
 }
 
-void rtl92c_init_beacon_parameters(struct ieee80211_hw *hw,
-                                   enum version_8192c version)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
-
-        rtl_write_word(rtlpriv, REG_TBTT_PROHIBIT, 0x6404);/* ms */
-        rtl_write_byte(rtlpriv, REG_DRVERLYINT, DRIVER_EARLY_INT_TIME);/*ms*/
-        rtl_write_byte(rtlpriv, REG_BCNDMATIM, BCN_DMA_ATIME_INT_TIME);
-        if (IS_NORMAL_CHIP(rtlhal->version))
-                rtl_write_word(rtlpriv, REG_BCNTCFG, 0x660F);
-        else
-                rtl_write_word(rtlpriv, REG_BCNTCFG, 0x66FF);
-}
-
 void rtl92c_disable_fast_edca(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.h b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
index 58548e8f2c41..e34f0f14ccd7 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
@@ -70,9 +70,6 @@ void rtl92c_init_beacon_max_error(struct ieee80211_hw *hw);
 void rtl92c_init_rdg_setting(struct ieee80211_hw *hw);
 void rtl92c_init_retry_function(struct ieee80211_hw *hw);
 
-void rtl92c_init_beacon_parameters(struct ieee80211_hw *hw,
-                                   enum version_8192c version);
-
 void rtl92c_disable_fast_edca(struct ieee80211_hw *hw);
 void rtl92c_set_min_space(struct ieee80211_hw *hw, bool is2T);
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
index 12f6d474b492..c972fa50926d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
@@ -108,13 +108,8 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw,
 bool rtl92cu_phy_mac_config(struct ieee80211_hw *hw)
 {
         bool rtstatus;
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        bool is92c = IS_92C_SERIAL(rtlhal->version);
 
         rtstatus = _rtl92cu_phy_config_mac_with_headerfile(hw);
-        if (is92c && IS_HARDWARE_TYPE_8192CE(rtlhal))
-                rtl_write_byte(rtlpriv, 0x14, 0x71);
         return rtstatus;
 }
 
@@ -122,7 +117,6 @@ bool rtl92cu_phy_bb_config(struct ieee80211_hw *hw)
 {
         bool rtstatus = true;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u16 regval;
         u32 regval32;
         u8 b_reg_hwparafile = 1;
@@ -134,17 +128,11 @@ bool rtl92cu_phy_bb_config(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_AFE_PLL_CTRL, 0x83);
         rtl_write_byte(rtlpriv, REG_AFE_PLL_CTRL + 1, 0xdb);
         rtl_write_byte(rtlpriv, REG_RF_CTRL, RF_EN | RF_RSTB | RF_SDMRSTB);
-        if (IS_HARDWARE_TYPE_8192CE(rtlhal)) {
-                rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, FEN_PPLL | FEN_PCIEA |
-                               FEN_DIO_PCIE |   FEN_BB_GLB_RSTn | FEN_BBRSTB);
-        } else if (IS_HARDWARE_TYPE_8192CU(rtlhal)) {
-                rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD |
-                               FEN_BB_GLB_RSTn | FEN_BBRSTB);
-        }
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD |
+                       FEN_BB_GLB_RSTn | FEN_BBRSTB);
         regval32 = rtl_read_dword(rtlpriv, 0x87c);
         rtl_write_dword(rtlpriv, 0x87c, regval32 & (~BIT(31)));
-        if (IS_HARDWARE_TYPE_8192CU(rtlhal))
-                rtl_write_byte(rtlpriv, REG_LDOHCI12_CTRL, 0x0f);
+        rtl_write_byte(rtlpriv, REG_LDOHCI12_CTRL, 0x0f);
         rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL + 1, 0x80);
         if (b_reg_hwparafile == 1)
                 rtstatus = _rtl92c_phy_bb8192c_config_parafile(hw);
@@ -162,7 +150,7 @@ bool _rtl92cu_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_Array\n");
         arraylength =  rtlphy->hwparam_tables[MAC_REG].length ;
         ptrarray = rtlphy->hwparam_tables[MAC_REG].pdata;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CEMAC_2T_ARRAY\n");
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CUMAC_2T_ARRAY\n");
         for (i = 0; i < arraylength; i = i + 2)
                 rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);
         return true;
@@ -259,18 +247,18 @@ bool rtl92cu_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 radiob_arraylen = rtlphy->hwparam_tables[RADIOB_2T].length;
                 radiob_array_table = rtlphy->hwparam_tables[RADIOB_2T].pdata;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         "Radio_A:RTL8192CERADIOA_2TARRAY\n");
+                         "Radio_A:RTL8192CURADIOA_2TARRAY\n");
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         "Radio_B:RTL8192CE_RADIOB_2TARRAY\n");
+                         "Radio_B:RTL8192CU_RADIOB_2TARRAY\n");
         } else {
                 radioa_arraylen = rtlphy->hwparam_tables[RADIOA_1T].length;
                 radioa_array_table = rtlphy->hwparam_tables[RADIOA_1T].pdata;
                 radiob_arraylen = rtlphy->hwparam_tables[RADIOB_1T].length;
                 radiob_array_table = rtlphy->hwparam_tables[RADIOB_1T].pdata;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         "Radio_A:RTL8192CE_RADIOA_1TARRAY\n");
+                         "Radio_A:RTL8192CU_RADIOA_1TARRAY\n");
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         "Radio_B:RTL8192CE_RADIOB_1TARRAY\n");
+                         "Radio_B:RTL8192CU_RADIOB_1TARRAY\n");
         }
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Radio No %x\n", rfpath);
         switch (rfpath) {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
index b878d56d2f4d..5624ade92cc0 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
@@ -66,7 +66,6 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u32 tx_agc[2] = { 0, 0 }, tmpval = 0;
@@ -74,14 +73,8 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         u8 idx1, idx2;
         u8 *ptr;
 
-        if (rtlhal->interface == INTF_PCI) {
-                if (rtlefuse->eeprom_regulatory != 0)
-                        turbo_scanoff = true;
-        } else {
-                if ((rtlefuse->eeprom_regulatory != 0) ||
-                    (rtlefuse->external_pa))
-                        turbo_scanoff = true;
-        }
+        if ((rtlefuse->eeprom_regulatory != 0) || (rtlefuse->external_pa))
+                turbo_scanoff = true;
         if (mac->act_scanning) {
                 tx_agc[RF90_PATH_A] = 0x3f3f3f3f;
                 tx_agc[RF90_PATH_B] = 0x3f3f3f3f;
@@ -90,11 +83,8 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
                             (ppowerlevel[idx1] << 8) |
                             (ppowerlevel[idx1] << 16) |
                             (ppowerlevel[idx1] << 24);
-                        if (rtlhal->interface == INTF_USB) {
-                                if (tx_agc[idx1] > 0x20 &&
-                                    rtlefuse->external_pa)
-                                        tx_agc[idx1] = 0x20;
-                        }
+                        if (tx_agc[idx1] > 0x20 && rtlefuse->external_pa)
+                                tx_agc[idx1] = 0x20;
                 }
         } else {
                 if (rtlpriv->dm.dynamic_txhighpower_lvl ==
@@ -452,9 +442,6 @@ static bool _rtl92c_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
                 udelay(1);
                 switch (rfpath) {
                 case RF90_PATH_A:
-                        rtstatus = rtl92cu_phy_config_rf_with_headerfile(hw,
-                                        (enum radio_path) rfpath);
-                        break;
                 case RF90_PATH_B:
                         rtstatus = rtl92cu_phy_config_rf_with_headerfile(hw,
                                         (enum radio_path) rfpath);
@@ -483,7 +470,6 @@ static bool _rtl92c_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
                 }
         }
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "<---\n");
-        return rtstatus;
 phy_rf_cfg_fail:
         return rtstatus;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index cbead007171f..95880fe4106e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -321,7 +321,7 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw,
         stats->rate = (u8) GET_RX_DESC_RX_MCS(pdesc);
         stats->shortpreamble = (u16) GET_RX_DESC_SPLCP(pdesc);
         stats->isampdu = (bool) (GET_RX_DESC_PAGGR(pdesc) == 1);
-        stats->isampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1)
+        stats->isfirst_ampdu = (bool)((GET_RX_DESC_PAGGR(pdesc) == 1)
                                    && (GET_RX_DESC_FAGGR(pdesc) == 1));
         stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);
         stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
index a1be5a68edfb..587b8c505a76 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
@@ -1240,23 +1240,22 @@ static void rtl92d_dm_initialize_txpower_tracking(struct ieee80211_hw *hw)
 void rtl92d_dm_check_txpower_tracking_thermal_meter(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        static u8 tm_trigger;
 
         if (!rtlpriv->dm.txpower_tracking)
                 return;
 
-        if (!tm_trigger) {
+        if (!rtlpriv->dm.tm_trigger) {
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, BIT(17) |
                               BIT(16), 0x03);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Trigger 92S Thermal Meter!!\n");
-                tm_trigger = 1;
+                rtlpriv->dm.tm_trigger = 1;
                 return;
         } else {
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Schedule TxPowerTracking direct call!!\n");
                 rtl92d_dm_txpower_tracking_callback_thermalmeter(hw);
-                tm_trigger = 0;
+                rtlpriv->dm.tm_trigger = 0;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
index 575980b88658..9bae5a92e30f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
@@ -200,7 +200,6 @@ static void _rtl92s_dm_check_txpowertracking_thermalmeter(
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
-        static u8 tm_trigger;
         u8 tx_power_checkcnt = 5;
 
         /* 2T2R TP issue */
@@ -215,13 +214,13 @@ static void _rtl92s_dm_check_txpowertracking_thermalmeter(
                 return;
         }
 
-        if (!tm_trigger) {
+        if (!rtlpriv->dm.tm_trigger) {
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER,
                               RFREG_OFFSET_MASK, 0x60);
-                tm_trigger = 1;
+                rtlpriv->dm.tm_trigger = 1;
         } else {
                 _rtl92s_dm_txpowertracking_callback_thermalmeter(hw);
-                tm_trigger = 0;
+                rtlpriv->dm.tm_trigger = 0;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
index e77c3a46c94a..3a81cdba8ca3 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
@@ -909,23 +909,22 @@ static void rtl8723be_dm_txpower_tracking_callback_thermalmeter(
 void rtl8723be_dm_check_txpower_tracking(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        static u8 tm_trigger;
 
         if (!rtlpriv->dm.txpower_tracking)
                 return;
 
-        if (!tm_trigger) {
+        if (!rtlpriv->dm.tm_trigger) {
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, BIT(17) | BIT(16),
                               0x03);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Trigger 8723be Thermal Meter!!\n");
-                tm_trigger = 1;
+                rtlpriv->dm.tm_trigger = 1;
                 return;
         } else {
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Schedule TxPowerTracking !!\n");
                 rtl8723be_dm_txpower_tracking_callback_thermalmeter(hw);
-                tm_trigger = 0;
+                rtlpriv->dm.tm_trigger = 0;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
index 342678d2ed42..b57cfd965196 100644
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
@@ -1068,20 +1068,18 @@ static void rtl8812ae_dm_check_txpower_tracking_thermalmeter(
                 struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        static u8 tm_trigger;
 
-        if (!tm_trigger) {
+        if (!rtlpriv->dm.tm_trigger) {
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER_88E,
                               BIT(17) | BIT(16), 0x03);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Trigger 8812 Thermal Meter!!\n");
-                tm_trigger = 1;
+                rtlpriv->dm.tm_trigger = 1;
                 return;
         }
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                  "Schedule TxPowerTracking direct call!!\n");
         rtl8812ae_dm_txpower_tracking_callback_thermalmeter(hw);
-        tm_trigger = 0;
 }
 
 static void rtl8821ae_dm_iq_calibrate(struct ieee80211_hw *hw)
@@ -2519,21 +2517,19 @@ void rtl8821ae_dm_txpower_tracking_callback_thermalmeter(
 void rtl8821ae_dm_check_txpower_tracking_thermalmeter(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        static u8 tm_trigger;
-
-        if (!tm_trigger) {
+        if (!rtlpriv->dm.tm_trigger) {
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER_88E, BIT(17)|BIT(16),
                               0x03);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Trigger 8821ae Thermal Meter!!\n");
-                tm_trigger = 1;
+                rtlpriv->dm.tm_trigger = 1;
                 return;
         } else {
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Schedule TxPowerTracking !!\n");
 
                 rtl8821ae_dm_txpower_tracking_callback_thermalmeter(hw);
-                tm_trigger = 0;
+                rtlpriv->dm.tm_trigger = 0;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 51572912c53d..2b770b5e2620 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1665,6 +1665,7 @@ struct rtl_dm {
         u8 last_dtp_lvl;
         u8 thermalvalue_avg[AVG_THERMAL_NUM];
         u8 thermalvalue_avg_index;
+        u8 tm_trigger;
         bool done_txpower;
         u8 dynamic_txhighpower_lvl;     /*Tx high power level */
         u8 dm_flag;             /*Indicate each dynamic mechanism's status. */