rtlwifi: Create new routine to initialize the DM tables

Each of the drivers contains a routine that initializes the dm_digtable
member of the driver's private area. As a first step toward reducing the
size of the drivers, a copy of this driver is created in rtlwifi, and the
definitions of the parameters are moved there.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index deab85236bfdb7fb4bd38bf090ceea0661752cc3..5aa3ab3fff35dcb43a6c76a70ab21c6739f89343 100644 (file)
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -1871,3 +1871,37 @@ bool rtl_btc_status_false(void)
        return false;
 }
 EXPORT_SYMBOL_GPL(rtl_btc_status_false);
+
+void rtl_dm_diginit(struct ieee80211_hw *hw, u32 cur_igvalue)
+{
+       struct rtl_priv *rtlpriv = rtl_priv(hw);
+       struct dig_t *dm_digtable = &rtlpriv->dm_digtable;
+
+       dm_digtable->dig_enable_flag = true;
+       dm_digtable->cur_igvalue = cur_igvalue;
+       dm_digtable->pre_igvalue = 0;
+       dm_digtable->cur_sta_cstate = DIG_STA_DISCONNECT;
+       dm_digtable->presta_cstate = DIG_STA_DISCONNECT;
+       dm_digtable->curmultista_cstate = DIG_MULTISTA_DISCONNECT;
+       dm_digtable->rssi_lowthresh = DM_DIG_THRESH_LOW;
+       dm_digtable->rssi_highthresh = DM_DIG_THRESH_HIGH;
+       dm_digtable->fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
+       dm_digtable->fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
+       dm_digtable->rx_gain_max = DM_DIG_MAX;
+       dm_digtable->rx_gain_min = DM_DIG_MIN;
+       dm_digtable->back_val = DM_DIG_BACKOFF_DEFAULT;
+       dm_digtable->back_range_max = DM_DIG_BACKOFF_MAX;
+       dm_digtable->back_range_min = DM_DIG_BACKOFF_MIN;
+       dm_digtable->pre_cck_cca_thres = 0xff;
+       dm_digtable->cur_cck_cca_thres = 0x83;
+       dm_digtable->forbidden_igi = DM_DIG_MIN;
+       dm_digtable->large_fa_hit = 0;
+       dm_digtable->recover_cnt = 0;
+       dm_digtable->dig_min_0 = 0x25;
+       dm_digtable->dig_min_1 = 0x25;
+       dm_digtable->media_connect_0 = false;
+       dm_digtable->media_connect_1 = false;
+       rtlpriv->dm.dm_initialgain_enable = true;
+       dm_digtable->bt30_cur_igi = 0x32;
+}
+EXPORT_SYMBOL(rtl_dm_diginit);

diff --git a/drivers/net/wireless/rtlwifi/core.h b/drivers/net/wireless/rtlwifi/core.h
index 8c87eb54be660ce22ba00ff55bcb4659ef89a12b..c0a03174b666a94c1049d3c4719e236e4ded2acd 100644 (file)
--- a/drivers/net/wireless/rtlwifi/core.h
+++ b/drivers/net/wireless/rtlwifi/core.h
@@ -35,6 +35,29 @@
 
 #define RTL_SUPPORTED_CTRL_FILTER      0xFF
 
+#define DM_DIG_THRESH_HIGH             40
+#define DM_DIG_THRESH_LOW              35
+#define DM_FALSEALARM_THRESH_LOW       400
+#define DM_FALSEALARM_THRESH_HIGH      1000
+
+#define DM_DIG_MAX                     0x3e
+#define DM_DIG_MIN                     0x1e
+#define DM_DIG_BACKOFF_MAX             12
+#define DM_DIG_BACKOFF_MIN             -4
+#define DM_DIG_BACKOFF_DEFAULT         10
+
+enum dm_dig_connect_e {
+       DIG_STA_DISCONNECT,
+       DIG_STA_CONNECT,
+       DIG_STA_BEFORE_CONNECT,
+       DIG_MULTISTA_DISCONNECT,
+       DIG_MULTISTA_CONNECT,
+       DIG_AP_DISCONNECT,
+       DIG_AP_CONNECT,
+       DIG_AP_ADD_STATION,
+       DIG_CONNECT_MAX
+};
+
 extern const struct ieee80211_ops rtl_ops;
 void rtl_fw_cb(const struct firmware *firmware, void *context);
 void rtl_wowlan_fw_cb(const struct firmware *firmware, void *context);
@@ -44,5 +67,6 @@ void rtl_rfreg_delay(struct ieee80211_hw *hw, enum radio_path rfpath, u32 addr,
 void rtl_bb_delay(struct ieee80211_hw *hw, u32 addr, u32 data);
 bool rtl_cmd_send_packet(struct ieee80211_hw *hw, struct sk_buff *skb);
 bool rtl_btc_status_false(void);
+void rtl_dm_diginit(struct ieee80211_hw *hw, u32 cur_igval);
 
 #endif

diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
index 2aa34d9055f0e6eebbb9dc91f0c7a356a3a207a7..7ebf6e06871f2b3605c31fb6afd20cab26147bca 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c
@@ -26,6 +26,7 @@
 #include "../wifi.h"
 #include "../base.h"
 #include "../pci.h"
+#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"

diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.h b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.h
index 64f1f3ea98071b1fe2892c0c28ae86fd3eb904e8..6217b7c2842af2469633923d58edb806f2cfe974 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.h
@@ -186,15 +186,6 @@
 #define BW_AUTO_SWITCH_HIGH_LOW                                25
 #define BW_AUTO_SWITCH_LOW_HIGH                                30
 
-#define DM_DIG_THRESH_HIGH                             40
-#define DM_DIG_THRESH_LOW                              35
-
-#define DM_FALSEALARM_THRESH_LOW                       400
-#define DM_FALSEALARM_THRESH_HIGH                      1000
-
-#define DM_DIG_MAX                                     0x3e
-#define DM_DIG_MIN                                     0x1e
-
 #define DM_DIG_MAX_AP                                  0x32
 #define DM_DIG_MIN_AP                                  0x20
 
@@ -204,10 +195,6 @@
 #define DM_DIG_FA_TH1                                  0x300
 #define DM_DIG_FA_TH2                                  0x400
 
-#define DM_DIG_BACKOFF_MAX                             12
-#define DM_DIG_BACKOFF_MIN                             -4
-#define DM_DIG_BACKOFF_DEFAULT                         10
-
 #define RXPATHSELECTION_SS_TH_W                                30
 #define RXPATHSELECTION_DIFF_TH                                18
 
@@ -296,15 +283,6 @@ enum dm_dig_ext_port_alg_e {
        DIG_EXT_PORT_STAGE_MAX = 4,
 };
 
-enum dm_dig_connect_e {
-       DIG_STA_DISCONNECT = 0,
-       DIG_STA_CONNECT = 1,
-       DIG_STA_BEFORE_CONNECT = 2,
-       DIG_MULTISTA_DISCONNECT = 3,
-       DIG_MULTISTA_CONNECT = 4,
-       DIG_CONNECT_MAX
-};
-
 enum pwr_track_control_method {
        BBSWING,
        TXAGC

diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index c3aad76fb47328c393703fb4ce45268b6ca87b51..dabe18f168e0f8f3f67f7f500454cac54caab671 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -32,6 +32,7 @@
 #include "phy_common.h"
 #include "../pci.h"
 #include "../base.h"
+#include "../core.h"
 
 #define BT_RSSI_STATE_NORMAL_POWER     BIT_OFFSET_LEN_MASK_32(0, 1)
 #define BT_RSSI_STATE_AMDPU_OFF                BIT_OFFSET_LEN_MASK_32(1, 1)

diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
index 4f232a063636ee01aa137efffca38b0dcc034b21..55ebffd91428c70002908fe0fe047e9c56da2b92 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
@@ -47,25 +47,12 @@
 #define BW_AUTO_SWITCH_HIGH_LOW                        25
 #define BW_AUTO_SWITCH_LOW_HIGH                        30
 
-#define DM_DIG_THRESH_HIGH                     40
-#define DM_DIG_THRESH_LOW                      35
-
-#define DM_FALSEALARM_THRESH_LOW               400
-#define DM_FALSEALARM_THRESH_HIGH              1000
-
-#define DM_DIG_MAX                             0x3e
-#define DM_DIG_MIN                             0x1e
-
 #define DM_DIG_FA_UPPER                                0x32
 #define DM_DIG_FA_LOWER                                0x20
 #define DM_DIG_FA_TH0                          0x20
 #define DM_DIG_FA_TH1                          0x100
 #define DM_DIG_FA_TH2                          0x200
 
-#define DM_DIG_BACKOFF_MAX                     12
-#define DM_DIG_BACKOFF_MIN                     -4
-#define DM_DIG_BACKOFF_DEFAULT                 10
-
 #define RXPATHSELECTION_SS_TH_lOW              30
 #define RXPATHSELECTION_DIFF_TH                        18
 
@@ -157,15 +144,6 @@ enum dm_dig_ext_port_alg_e {
        DIG_EXT_PORT_STAGE_MAX = 4,
 };
 
-enum dm_dig_connect_e {
-       DIG_STA_DISCONNECT = 0,
-       DIG_STA_CONNECT = 1,
-       DIG_STA_BEFORE_CONNECT = 2,
-       DIG_MULTISTA_DISCONNECT = 3,
-       DIG_MULTISTA_CONNECT = 4,
-       DIG_CONNECT_MAX
-};
-
 void rtl92c_dm_init(struct ieee80211_hw *hw);
 void rtl92c_dm_watchdog(struct ieee80211_hw *hw);
 void rtl92c_dm_write_dig(struct ieee80211_hw *hw);

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
index 74f9c083b80dc4dee7396cda8e61e3606ecbc1e2..09898cf2e07ab4859c7ff733bf3a94d94b127356 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
@@ -30,6 +30,7 @@
 #include "../wifi.h"
 #include "../base.h"
 #include "../pci.h"
+#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
index 9c5311c299fdf0b144c6ab092f82bba321084cb9..38ba707015f52a0da261da7bc2d5cb4b443dd39f 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
@@ -42,25 +42,12 @@
 #define BW_AUTO_SWITCH_HIGH_LOW                        25
 #define BW_AUTO_SWITCH_LOW_HIGH                        30
 
-#define DM_DIG_THRESH_HIGH                     40
-#define DM_DIG_THRESH_LOW                      35
-
-#define DM_FALSEALARM_THRESH_LOW               400
-#define DM_FALSEALARM_THRESH_HIGH              1000
-
-#define DM_DIG_MAX                             0x3e
-#define DM_DIG_MIN                             0x1e
-
 #define DM_DIG_FA_UPPER                                0x32
 #define DM_DIG_FA_LOWER                                0x20
 #define DM_DIG_FA_TH0                          0x20
 #define DM_DIG_FA_TH1                          0x100
 #define DM_DIG_FA_TH2                          0x200
 
-#define DM_DIG_BACKOFF_MAX                     12
-#define DM_DIG_BACKOFF_MIN                     -4
-#define DM_DIG_BACKOFF_DEFAULT                 10
-
 #define RXPATHSELECTION_SS_TH_lOW              30
 #define RXPATHSELECTION_DIFF_TH                        18
 

diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
index 304c443b89b261b3a633f276962e35ef536998f7..75643abe0571d7fa905d217124a0d5c5f43d94d8 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
@@ -29,6 +29,7 @@
 
 #include "../wifi.h"
 #include "../base.h"
+#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"

diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.h b/drivers/net/wireless/rtlwifi/rtl8192de/dm.h
index 3fea0c11c24ae60244543d717d9e6cd71fcde514..d21b3bceab6206ec785a1f05d070c38b0e625a55 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.h
@@ -42,25 +42,12 @@
 #define BW_AUTO_SWITCH_HIGH_LOW                        25
 #define BW_AUTO_SWITCH_LOW_HIGH                        30
 
-#define DM_DIG_THRESH_HIGH                     40
-#define DM_DIG_THRESH_LOW                      35
-
-#define DM_FALSEALARM_THRESH_LOW               400
-#define DM_FALSEALARM_THRESH_HIGH              1000
-
-#define DM_DIG_MAX                             0x3e
-#define DM_DIG_MIN                             0x1c
-
 #define DM_DIG_FA_UPPER                                0x32
 #define DM_DIG_FA_LOWER                                0x20
 #define DM_DIG_FA_TH0                          0x100
 #define DM_DIG_FA_TH1                          0x400
 #define DM_DIG_FA_TH2                          0x600
 
-#define DM_DIG_BACKOFF_MAX                     12
-#define DM_DIG_BACKOFF_MIN                     -4
-#define DM_DIG_BACKOFF_DEFAULT                 10
-
 #define RXPATHSELECTION_SS_TH_lOW              30
 #define RXPATHSELECTION_DIFF_TH                        18
 
@@ -142,15 +129,6 @@ enum dm_dig_ext_port_alg {
        DIG_EXT_PORT_STAGE_MAX = 4,
 };
 
-enum dm_dig_connect {
-       DIG_STA_DISCONNECT = 0,
-       DIG_STA_CONNECT = 1,
-       DIG_STA_BEFORE_CONNECT = 2,
-       DIG_MULTISTA_DISCONNECT = 3,
-       DIG_MULTISTA_CONNECT = 4,
-       DIG_CONNECT_MAX
-};
-
 void rtl92d_dm_init(struct ieee80211_hw *hw);
 void rtl92d_dm_watchdog(struct ieee80211_hw *hw);
 void rtl92d_dm_init_edca_turbo(struct ieee80211_hw *hw);

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/dm.c b/drivers/net/wireless/rtlwifi/rtl8192ee/dm.c
index 2fa4c4551afb4aa95522b0130a2a9d6666be091a..70e58d102d1ebda3af7140eb4bc93ded0e2e1c4e 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ee/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/dm.c
@@ -26,6 +26,7 @@
 #include "../wifi.h"
 #include "../base.h"
 #include "../pci.h"
+#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/dm.h b/drivers/net/wireless/rtlwifi/rtl8192ee/dm.h
index 881db7d6fef77d57aceff86612d5cfb1444859c7..4880e191e02a6c3b6e551ffb8121a4ad1261bf35 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ee/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/dm.h
@@ -189,15 +189,6 @@
 #define BW_AUTO_SWITCH_HIGH_LOW                        25
 #define BW_AUTO_SWITCH_LOW_HIGH                        30
 
-#define DM_DIG_THRESH_HIGH                     40
-#define DM_DIG_THRESH_LOW                      35
-
-#define DM_FALSEALARM_THRESH_LOW               400
-#define DM_FALSEALARM_THRESH_HIGH              1000
-
-#define DM_DIG_MAX                             0x3e
-#define DM_DIG_MIN                             0x1e
-
 #define DM_DIG_MAX_AP                          0x32
 #define DM_DIG_MIN_AP                          0x20
 
@@ -207,10 +198,6 @@
 #define DM_DIG_FA_TH1                          0x300
 #define DM_DIG_FA_TH2                          0x400
 
-#define DM_DIG_BACKOFF_MAX                     12
-#define DM_DIG_BACKOFF_MIN                     -4
-#define DM_DIG_BACKOFF_DEFAULT                 10
-
 #define RXPATHSELECTION_SS_TH_LOW              30
 #define RXPATHSELECTION_DIFF_TH                        18
 

diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
index b3a2d5ec59e653273c61fc4a990746f408361f84..6cac70b77539ff74ebec3b4e055915354595ea03 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
@@ -29,6 +29,7 @@
 
 #include "../wifi.h"
 #include "../base.h"
+#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"

diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.h b/drivers/net/wireless/rtlwifi/rtl8192se/dm.h
index 2e9052c8fe4bb3aef06950fe36f35eca332b91ca..7d778d384fdebc22f594c73a4cbda5283452f319 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.h
@@ -54,16 +54,6 @@ enum dm_dig_sta {
        DM_STA_DIG_MAX
 };
 
-enum dm_dig_connect {
-       DIG_STA_DISCONNECT = 0,
-       DIG_STA_CONNECT = 1,
-       DIG_STA_BEFORE_CONNECT = 2,
-       DIG_AP_DISCONNECT = 3,
-       DIG_AP_CONNECT = 4,
-       DIG_AP_ADD_STATION = 5,
-       DIG_CONNECT_MAX
-};
-
 enum dm_dig_ext_port_alg {
        DIG_EXT_PORT_STAGE_0 = 0,
        DIG_EXT_PORT_STAGE_1 = 1,
@@ -99,22 +89,13 @@ enum dm_ratr_sta {
 #define        TX_POWER_NEAR_FIELD_THRESH_LVL2 74
 #define        TX_POWER_NEAR_FIELD_THRESH_LVL1 67
 
-#define DM_DIG_THRESH_HIGH             40
-#define DM_DIG_THRESH_LOW              35
-#define        DM_FALSEALARM_THRESH_LOW        40
-#define        DM_FALSEALARM_THRESH_HIGH       1000
 #define        DM_DIG_HIGH_PWR_THRESH_HIGH     75
 #define        DM_DIG_HIGH_PWR_THRESH_LOW      70
 #define        DM_DIG_BACKOFF                  12
-#define        DM_DIG_MAX                      0x3e
-#define        DM_DIG_MIN                      0x1c
 #define        DM_DIG_MIN_Netcore              0x12
-#define        DM_DIG_BACKOFF_MAX              12
-#define        DM_DIG_BACKOFF_MIN              -4
 
 void rtl92s_dm_watchdog(struct ieee80211_hw *hw);
 void rtl92s_dm_init(struct ieee80211_hw *hw);
 void rtl92s_dm_init_edca_turbo(struct ieee80211_hw *hw);
 
 #endif
-

diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c
index a0e86922780a6702d14957454ef7e0f9899496b1..80f4c5410a139da0fd70cb176e99c47546a69add 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.c
@@ -26,6 +26,7 @@
 #include "../wifi.h"
 #include "../base.h"
 #include "../pci.h"
+#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"

diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.h b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.h
index 6fa0feb05f6d11a4fe8f254a5d6622a76838c255..c54024e05489eb112ead869063bec37d14f3b359 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/dm.h
@@ -42,25 +42,12 @@
 #define BW_AUTO_SWITCH_HIGH_LOW                        25
 #define BW_AUTO_SWITCH_LOW_HIGH                        30
 
-#define DM_DIG_THRESH_HIGH                     40
-#define DM_DIG_THRESH_LOW                      35
-
-#define DM_FALSEALARM_THRESH_LOW               400
-#define DM_FALSEALARM_THRESH_HIGH              1000
-
-#define DM_DIG_MAX                             0x3e
-#define DM_DIG_MIN                             0x1e
-
 #define DM_DIG_FA_UPPER                                0x32
 #define DM_DIG_FA_LOWER                                0x20
 #define DM_DIG_FA_TH0                          0x20
 #define DM_DIG_FA_TH1                          0x100
 #define DM_DIG_FA_TH2                          0x200
 
-#define DM_DIG_BACKOFF_MAX                     12
-#define DM_DIG_BACKOFF_MIN                     -4
-#define DM_DIG_BACKOFF_DEFAULT                 10
-
 #define RXPATHSELECTION_SS_TH_LOW              30
 #define RXPATHSELECTION_DIFF_TH                        18
 
@@ -142,15 +129,6 @@ enum dm_dig_ext_port_alg_e {
        DIG_EXT_PORT_STAGE_MAX = 4,
 };
 
-enum dm_dig_connect_e {
-       DIG_STA_DISCONNECT = 0,
-       DIG_STA_CONNECT = 1,
-       DIG_STA_BEFORE_CONNECT = 2,
-       DIG_MULTISTA_DISCONNECT = 3,
-       DIG_MULTISTA_CONNECT = 4,
-       DIG_CONNECT_MAX
-};
-
 #define BT_RSSI_STATE_NORMAL_POWER      BIT_OFFSET_LEN_MASK_32(0, 1)
 #define BT_RSSI_STATE_AMDPU_OFF         BIT_OFFSET_LEN_MASK_32(1, 1)
 #define BT_RSSI_STATE_SPECIAL_LOW       BIT_OFFSET_LEN_MASK_32(2, 1)

diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
index b92c521e8c6397daa2530412497c3f5d55a73f80..ddf45d9fd6eacf118ce8ad3b0d61529a3e30c75d 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c
@@ -26,6 +26,7 @@
 #include "../wifi.h"
 #include "../base.h"
 #include "../pci.h"
+#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"

diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/dm.h b/drivers/net/wireless/rtlwifi/rtl8723be/dm.h
index e4c0e8ae6f4700385c3e3bec888b7e0c29fd7236..f3e47abe0baf3362a599227bdc1e7f7b06d76bf4 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8723be/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/dm.h
@@ -180,15 +180,6 @@
 #define BW_AUTO_SWITCH_HIGH_LOW                        25
 #define BW_AUTO_SWITCH_LOW_HIGH                        30
 
-#define DM_DIG_THRESH_HIGH                     40
-#define DM_DIG_THRESH_LOW                      35
-
-#define DM_FALSEALARM_THRESH_LOW               400
-#define DM_FALSEALARM_THRESH_HIGH              1000
-
-#define DM_DIG_MAX                             0x3e
-#define DM_DIG_MIN                             0x1e
-
 #define DM_DIG_MAX_AP                          0x32
 #define DM_DIG_MIN_AP                          0x20
 
@@ -198,10 +189,6 @@
 #define DM_DIG_FA_TH1                          0x300
 #define DM_DIG_FA_TH2                          0x400
 
-#define DM_DIG_BACKOFF_MAX                     12
-#define DM_DIG_BACKOFF_MIN                     -4
-#define DM_DIG_BACKOFF_DEFAULT                 10
-
 #define RXPATHSELECTION_SS_TH_LOW              30
 #define RXPATHSELECTION_DIFF_TH                        18
 
@@ -260,15 +247,6 @@ enum dm_dig_ext_port_alg_e {
        DIG_EXT_PORT_STAGE_MAX  = 4,
 };
 
-enum dm_dig_connect_e {
-       DIG_STA_DISCONNECT      = 0,
-       DIG_STA_CONNECT         = 1,
-       DIG_STA_BEFORE_CONNECT  = 2,
-       DIG_MULTISTA_DISCONNECT = 3,
-       DIG_MULTISTA_CONNECT    = 4,
-       DIG_CONNECT_MAX
-};
-
 enum pwr_track_control_method {
        BBSWING,
        TXAGC

diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
index 8b0bfb2bd8f7c310963ceedca53316fa45ed721f..4af4613cf7e3ad7a33a1d1ade636db0214ef03cc 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
@@ -26,6 +26,7 @@
 #include "../wifi.h"
 #include "../base.h"
 #include "../pci.h"
+#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"

diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.h b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.h
index 9dd40dd316c16ee257dc284e6fe21a24a4bacb5f..f3118879cbdf456f3a3a66a3e0557ea09ae42ea8 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.h
@@ -187,9 +187,6 @@
 #define BW_AUTO_SWITCH_HIGH_LOW                25
 #define BW_AUTO_SWITCH_LOW_HIGH                30
 
-#define DM_DIG_THRESH_HIGH                     40
-#define DM_DIG_THRESH_LOW                      35
-
 #define DM_FALSEALARM_THRESH_LOW       400
 #define DM_FALSEALARM_THRESH_HIGH      1000
 
@@ -205,10 +202,6 @@
 #define DM_DIG_FA_TH1                          0x300
 #define DM_DIG_FA_TH2                          0x400
 
-#define DM_DIG_BACKOFF_MAX                     12
-#define DM_DIG_BACKOFF_MIN                     -4
-#define DM_DIG_BACKOFF_DEFAULT         10
-
 #define RXPATHSELECTION_SS_TH_LOW      30
 #define RXPATHSELECTION_DIFF_TH                18
 
@@ -296,15 +289,6 @@ enum dm_dig_ext_port_alg_e {
        DIG_EXT_PORT_STAGE_MAX = 4,
 };
 
-enum dm_dig_connect_e {
-       DIG_STA_DISCONNECT = 0,
-       DIG_STA_CONNECT = 1,
-       DIG_STA_BEFORE_CONNECT = 2,
-       DIG_MULTISTA_DISCONNECT = 3,
-       DIG_MULTISTA_CONNECT = 4,
-       DIG_CONNECT_MAX
-};
-
 enum pwr_track_control_method {
        BBSWING,
        TXAGC,