forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-11 297b60346df8beafee954a0fd7c2d64f33f3b9bc 
 kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c
....@@ -1,27 +1,5 @@
1
-/******************************************************************************
2
- *
3
- * Copyright(c) 2009-2012  Realtek Corporation.
4
- *
5
- * This program is free software; you can redistribute it and/or modify it
6
- * under the terms of version 2 of the GNU General Public License as
7
- * published by the Free Software Foundation.
8
- *
9
- * This program is distributed in the hope that it will be useful, but WITHOUT
10
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
12
- * more details.
13
- *
14
- * The full GNU General Public License is included in this distribution in the
15
- * file called LICENSE.
16
- *
17
- * Contact Information:
18
- * wlanfae <wlanfae@realtek.com>
19
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
20
- * Hsinchu 300, Taiwan.
21
- *
22
- * Larry Finger <Larry.Finger@lwfinger.net>
23
- *
24
- *****************************************************************************/
1
+// SPDX-License-Identifier: GPL-2.0
2
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
253 
264 #include "../wifi.h"
275 #include "../efuse.h"
....@@ -133,8 +111,8 @@
133111 	case HW_VAR_SLOT_TIME:{
134112 			u8 e_aci;
135113 
136
-			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
137
-				 "HW_VAR_SLOT_TIME %x\n", val[0]);
114
+			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
115
+				"HW_VAR_SLOT_TIME %x\n", val[0]);
138116 
139117 			rtl_write_byte(rtlpriv, SLOT_TIME, val[0]);
140118 
....@@ -178,9 +156,9 @@
178156 
179157 				*val = min_spacing_to_set;
180158 
181
-				RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
182
-					 "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
183
-					 mac->min_space_cfg);
159
+				rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
160
+					"Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
161
+					mac->min_space_cfg);
184162 
185163 				rtl_write_byte(rtlpriv, AMPDU_MIN_SPACE,
186164 					       mac->min_space_cfg);
....@@ -194,9 +172,9 @@
194172 			mac->min_space_cfg = rtlpriv->rtlhal.minspace_cfg;
195173 			mac->min_space_cfg |= (density_to_set << 3);
196174 
197
-			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
198
-				 "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
199
-				 mac->min_space_cfg);
175
+			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
176
+				"Set HW_VAR_SHORTGI_DENSITY: %#x\n",
177
+				mac->min_space_cfg);
200178 
201179 			rtl_write_byte(rtlpriv, AMPDU_MIN_SPACE,
202180 				       mac->min_space_cfg);
....@@ -237,9 +215,9 @@
237215 					    (factorlevel[17] << 4));
238216 				rtl_write_byte(rtlpriv, AGGLEN_LMT_H, regtoset);
239217 
240
-				RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
241
-					 "Set HW_VAR_AMPDU_FACTOR: %#x\n",
242
-					 factor_toset);
218
+				rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,
219
+					"Set HW_VAR_AMPDU_FACTOR: %#x\n",
220
+					factor_toset);
243221 			}
244222 			break;
245223 		}
....@@ -258,7 +236,7 @@
258236 			union aci_aifsn *p_aci_aifsn = (union aci_aifsn *)(&(
259237 							mac->ac[0].aifs));
260238 			u8 acm = p_aci_aifsn->f.acm;
261
-			u8 acm_ctrl = rtl_read_byte(rtlpriv, AcmHwCtrl);
239
+			u8 acm_ctrl = rtl_read_byte(rtlpriv, ACMHWCTRL);
262240 
263241 			acm_ctrl = acm_ctrl | ((rtlpci->acm_method == 2) ?
264242 				   0x0 : 0x1);
....@@ -266,30 +244,30 @@
266244 			if (acm) {
267245 				switch (e_aci) {
268246 				case AC0_BE:
269
-					acm_ctrl |= AcmHw_BeqEn;
247
+					acm_ctrl |= ACMHW_BEQEN;
270248 					break;
271249 				case AC2_VI:
272
-					acm_ctrl |= AcmHw_ViqEn;
250
+					acm_ctrl |= ACMHW_VIQEN;
273251 					break;
274252 				case AC3_VO:
275
-					acm_ctrl |= AcmHw_VoqEn;
253
+					acm_ctrl |= ACMHW_VOQEN;
276254 					break;
277255 				default:
278
-					RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
279
-						 "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
280
-						 acm);
256
+					rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
257
+						"HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
258
+						acm);
281259 					break;
282260 				}
283261 			} else {
284262 				switch (e_aci) {
285263 				case AC0_BE:
286
-					acm_ctrl &= (~AcmHw_BeqEn);
264
+					acm_ctrl &= (~ACMHW_BEQEN);
287265 					break;
288266 				case AC2_VI:
289
-					acm_ctrl &= (~AcmHw_ViqEn);
267
+					acm_ctrl &= (~ACMHW_VIQEN);
290268 					break;
291269 				case AC3_VO:
292
-					acm_ctrl &= (~AcmHw_VoqEn);
270
+					acm_ctrl &= (~ACMHW_VOQEN);
293271 					break;
294272 				default:
295273 					pr_err("switch case %#x not processed\n",
....@@ -298,9 +276,9 @@
298276 				}
299277 			}
300278 
301
-			RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
302
-				 "HW_VAR_ACM_CTRL Write 0x%X\n", acm_ctrl);
303
-			rtl_write_byte(rtlpriv, AcmHwCtrl, acm_ctrl);
279
+			rtl_dbg(rtlpriv, COMP_QOS, DBG_TRACE,
280
+				"HW_VAR_ACM_CTRL Write 0x%X\n", acm_ctrl);
281
+			rtl_write_byte(rtlpriv, ACMHWCTRL, acm_ctrl);
304282 			break;
305283 		}
306284 	case HW_VAR_RCR:{
....@@ -439,14 +417,14 @@
439417 	struct rtl_priv *rtlpriv = rtl_priv(hw);
440418 	u8 sec_reg_value = 0x0;
441419 
442
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
443
-		 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
444
-		 rtlpriv->sec.pairwise_enc_algorithm,
445
-		 rtlpriv->sec.group_enc_algorithm);
420
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
421
+		"PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
422
+		rtlpriv->sec.pairwise_enc_algorithm,
423
+		rtlpriv->sec.group_enc_algorithm);
446424 
447425 	if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
448
-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
449
-			 "not open hw encryption\n");
426
+		rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
427
+			"not open hw encryption\n");
450428 		return;
451429 	}
452430 
....@@ -457,8 +435,8 @@
457435 		sec_reg_value |= SCR_RXUSEDK;
458436 	}
459437 
460
-	RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "The SECR-value %x\n",
461
-		 sec_reg_value);
438
+	rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD, "The SECR-value %x\n",
439
+		sec_reg_value);
462440 
463441 	rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
464442 
....@@ -869,7 +847,7 @@
869847 	/* 10. Power Save Control Register (Offset: 0x0260 - 0x02DF) */
870848 	/* 11. General Purpose Register (Offset: 0x02E0 - 0x02FF) */
871849 	/* 12. Host Interrupt Status Register (Offset: 0x0300 - 0x030F) */
872
-	/* 13. Test Mode and Debug Control Register (Offset: 0x0310 - 0x034F) */
850
+	/* 13. Test mode and Debug Control Register (Offset: 0x0310 - 0x034F) */
873851 
874852 	/* 14. Set driver info, we only accept PHY status now. */
875853 	rtl_write_byte(rtlpriv, RXDRVINFO_SZ, 4);
....@@ -892,10 +870,10 @@
892870 
893871 		/* Change Program timing */
894872 		rtl_write_byte(rtlpriv, REG_EFUSE_CTRL + 3, 0x72);
895
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "EFUSE CONFIG OK\n");
873
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "EFUSE CONFIG OK\n");
896874 	}
897875 
898
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "OK\n");
876
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "OK\n");
899877 
900878 }
901879 
....@@ -982,9 +960,8 @@
982960 	/* 2. download firmware */
983961 	rtstatus = rtl92s_download_fw(hw);
984962 	if (!rtstatus) {
985
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
986
-			 "Failed to download FW. Init HW without FW now... "
987
-			 "Please copy FW into /lib/firmware/rtlwifi\n");
963
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
964
+			"Failed to download FW. Init HW without FW now... Please copy FW into /lib/firmware/rtlwifi\n");
988965 		err = 1;
989966 		goto exit;
990967 	}
....@@ -1036,7 +1013,7 @@
10361013 		rtl_write_byte(rtlpriv, RF_CTRL, 0x07);
10371014 
10381015 	if (!rtl92s_phy_rf_config(hw)) {
1039
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "RF Config failed\n");
1016
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "RF Config failed\n");
10401017 		err = rtstatus;
10411018 		goto exit;
10421019 	}
....@@ -1169,23 +1146,23 @@
11691146 	switch (type) {
11701147 	case NL80211_IFTYPE_UNSPECIFIED:
11711148 		bt_msr |= (MSR_LINK_NONE << MSR_LINK_SHIFT);
1172
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1173
-			 "Set Network type to NO LINK!\n");
1149
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1150
+			"Set Network type to NO LINK!\n");
11741151 		break;
11751152 	case NL80211_IFTYPE_ADHOC:
11761153 		bt_msr |= (MSR_LINK_ADHOC << MSR_LINK_SHIFT);
1177
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1178
-			 "Set Network type to Ad Hoc!\n");
1154
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1155
+			"Set Network type to Ad Hoc!\n");
11791156 		break;
11801157 	case NL80211_IFTYPE_STATION:
11811158 		bt_msr |= (MSR_LINK_MANAGED << MSR_LINK_SHIFT);
1182
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1183
-			 "Set Network type to STA!\n");
1159
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1160
+			"Set Network type to STA!\n");
11841161 		break;
11851162 	case NL80211_IFTYPE_AP:
11861163 		bt_msr |= (MSR_LINK_MASTER << MSR_LINK_SHIFT);
1187
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1188
-			 "Set Network type to AP!\n");
1164
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
1165
+			"Set Network type to AP!\n");
11891166 		break;
11901167 	default:
11911168 		pr_err("Network type %d not supported!\n", type);
....@@ -1374,9 +1351,9 @@
13741351 	/* SW/HW radio off or halt adapter!! For example S3/S4 */
13751352 	} else {
13761353 		/* LED function disable. Power range is about 8mA now. */
1377
-		/* if write 0xF1 disconnet_pci power
1354
+		/* if write 0xF1 disconnect_pci power
13781355 		 *	 ifconfig wlan0 down power are both high 35:70 */
1379
-		/* if write oxF9 disconnet_pci power
1356
+		/* if write oxF9 disconnect_pci power
13801357 		 * ifconfig wlan0 down power are both low  12:45*/
13811358 		rtl_write_byte(rtlpriv, 0x03, 0xF9);
13821359 	}
....@@ -1628,8 +1605,8 @@
16281605 	struct rtl_priv *rtlpriv = rtl_priv(hw);
16291606 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
16301607 
1631
-	RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD, "add_msr:%x, rm_msr:%x\n",
1632
-		 add_msr, rm_msr);
1608
+	rtl_dbg(rtlpriv, COMP_INTR, DBG_LOUD, "add_msr:%x, rm_msr:%x\n",
1609
+		add_msr, rm_msr);
16331610 
16341611 	if (add_msr)
16351612 		rtlpci->irq_mask[0] |= add_msr;
....@@ -1641,7 +1618,7 @@
16411618 	rtl92se_enable_interrupt(hw);
16421619 }
16431620 
1644
-static void _rtl8192se_get_IC_Inferiority(struct ieee80211_hw *hw)
1621
+static void _rtl8192se_get_ic_inferiority(struct ieee80211_hw *hw)
16451622 {
16461623 	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
16471624 	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
....@@ -1693,18 +1670,18 @@
16931670 
16941671 	eeprom_id = *((u16 *)&hwinfo[0]);
16951672 	if (eeprom_id != RTL8190_EEPROM_ID) {
1696
-		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
1697
-			 "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
1673
+		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
1674
+			"EEPROM ID(%#x) is invalid!!\n", eeprom_id);
16981675 		rtlefuse->autoload_failflag = true;
16991676 	} else {
1700
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
1677
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
17011678 		rtlefuse->autoload_failflag = false;
17021679 	}
17031680 
17041681 	if (rtlefuse->autoload_failflag)
17051682 		return;
17061683 
1707
-	_rtl8192se_get_IC_Inferiority(hw);
1684
+	_rtl8192se_get_ic_inferiority(hw);
17081685 
17091686 	/* Read IC Version && Channel Plan */
17101687 	/* VID, DID	 SE	0xA-D */
....@@ -1714,16 +1691,16 @@
17141691 	rtlefuse->eeprom_smid = *(u16 *)&hwinfo[EEPROM_SMID];
17151692 	rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];
17161693 
1717
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1718
-		 "EEPROMId = 0x%4x\n", eeprom_id);
1719
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1720
-		 "EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);
1721
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1722
-		 "EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);
1723
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1724
-		 "EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);
1725
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1726
-		 "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);
1694
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1695
+		"EEPROMId = 0x%4x\n", eeprom_id);
1696
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1697
+		"EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);
1698
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1699
+		"EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);
1700
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1701
+		"EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);
1702
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1703
+		"EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);
17271704 
17281705 	for (i = 0; i < 6; i += 2) {
17291706 		usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i];
....@@ -1733,7 +1710,7 @@
17331710 	for (i = 0; i < 6; i++)
17341711 		rtl_write_byte(rtlpriv, MACIDR0 + i, rtlefuse->dev_addr[i]);
17351712 
1736
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);
1713
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);
17371714 
17381715 	/* Get Tx Power Level by Channel */
17391716 	/* Read Tx power of Channel 1 ~ 14 from EEPROM. */
....@@ -1928,7 +1905,7 @@
19281905 	 * index diff of legacy to HT OFDM rate. */
19291906 	tempval = hwinfo[EEPROM_RFIND_POWERDIFF] & 0xff;
19301907 	rtlefuse->eeprom_txpowerdiff = tempval;
1931
-	rtlefuse->legacy_httxpowerdiff =
1908
+	rtlefuse->legacy_ht_txpowerdiff =
19321909 		rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][0];
19331910 
19341911 	RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
....@@ -1986,15 +1963,15 @@
19861963 		tempval = rtl_read_byte(rtlpriv, 0x07);
19871964 		if (!(tempval & BIT(0))) {
19881965 			rtlefuse->b1x1_recvcombine = true;
1989
-			RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1990
-				 "RF_TYPE=1T2R but only 1SS\n");
1966
+			rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
1967
+				"RF_TYPE=1T2R but only 1SS\n");
19911968 		}
19921969 	}
19931970 	rtlefuse->b1ss_support = rtlefuse->b1x1_recvcombine;
19941971 	rtlefuse->eeprom_oemid = *&hwinfo[EEPROM_CUSTOMID];
19951972 
1996
-	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x\n",
1997
-		 rtlefuse->eeprom_oemid);
1973
+	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x\n",
1974
+		rtlefuse->eeprom_oemid);
19981975 
19991976 	/* set channel paln to world wide 13 */
20001977 	rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13;
....@@ -2009,15 +1986,15 @@
20091986 	tmp_u1b = rtl_read_byte(rtlpriv, EPROM_CMD);
20101987 
20111988 	if (tmp_u1b & BIT(4)) {
2012
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
1989
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
20131990 		rtlefuse->epromtype = EEPROM_93C46;
20141991 	} else {
2015
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
1992
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
20161993 		rtlefuse->epromtype = EEPROM_BOOT_EFUSE;
20171994 	}
20181995 
20191996 	if (tmp_u1b & BIT(5)) {
2020
-		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
1997
+		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
20211998 		rtlefuse->autoload_failflag = false;
20221999 		_rtl92se_read_adapter_info(hw);
20232000 	} else {
....@@ -2123,8 +2100,8 @@
21232100 	else
21242101 		rtl92s_phy_set_fw_cmd(hw, FW_CMD_RA_REFRESH_BG);
21252102 
2126
-	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",
2127
-		 rtl_read_dword(rtlpriv, ARFR0));
2103
+	rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",
2104
+		rtl_read_dword(rtlpriv, ARFR0));
21282105 }
21292106 
21302107 static void rtl92se_update_hal_rate_mask(struct ieee80211_hw *hw,
....@@ -2278,8 +2255,8 @@
22782255 
22792256 	mask |= (bmulticast ? 1 : 0) << 9 | (macid & 0x1f) << 4 | (band & 0xf);
22802257 
2281
-	RT_TRACE(rtlpriv, COMP_RATR, DBG_TRACE, "mask = %x, bitmap = %x\n",
2282
-		 mask, ratr_bitmap);
2258
+	rtl_dbg(rtlpriv, COMP_RATR, DBG_TRACE, "mask = %x, bitmap = %x\n",
2259
+		mask, ratr_bitmap);
22832260 	rtl_write_dword(rtlpriv, 0x2c4, ratr_bitmap);
22842261 	rtl_write_dword(rtlpriv, WFM5, (FW_RA_UPDATE_MASK | (mask << 8)));
22852262 
....@@ -2354,15 +2331,15 @@
23542331 	rfpwr_toset = _rtl92se_rf_onoff_detect(hw);
23552332 
23562333 	if ((ppsc->hwradiooff) && (rfpwr_toset == ERFON)) {
2357
-		RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
2358
-			 "RFKILL-HW Radio ON, RF ON\n");
2334
+		rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,
2335
+			"RFKILL-HW Radio ON, RF ON\n");
23592336 
23602337 		rfpwr_toset = ERFON;
23612338 		ppsc->hwradiooff = false;
23622339 		actuallyset = true;
23632340 	} else if ((!ppsc->hwradiooff) && (rfpwr_toset == ERFOFF)) {
2364
-		RT_TRACE(rtlpriv, COMP_RF,
2365
-			 DBG_DMESG, "RFKILL-HW Radio OFF, RF OFF\n");
2341
+		rtl_dbg(rtlpriv, COMP_RF,
2342
+			DBG_DMESG, "RFKILL-HW Radio OFF, RF OFF\n");
23662343 
23672344 		rfpwr_toset = ERFOFF;
23682345 		ppsc->hwradiooff = true;
....@@ -2426,7 +2403,7 @@
24262403 		u8 cam_offset = 0;
24272404 		u8 clear_number = 5;
24282405 
2429
-		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
2406
+		rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
24302407 
24312408 		for (idx = 0; idx < clear_number; idx++) {
24322409 			rtl_cam_mark_invalid(hw, cam_offset + idx);
....@@ -2485,26 +2462,26 @@
24852462 		}
24862463 
24872464 		if (rtlpriv->sec.key_len[key_index] == 0) {
2488
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
2489
-				 "delete one entry, entry_id is %d\n",
2490
-				 entry_id);
2465
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
2466
+				"delete one entry, entry_id is %d\n",
2467
+				entry_id);
24912468 			if (mac->opmode == NL80211_IFTYPE_AP)
24922469 				rtl_cam_del_entry(hw, p_macaddr);
24932470 			rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
24942471 		} else {
2495
-			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
2496
-				 "add one entry\n");
2472
+			rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
2473
+				"add one entry\n");
24972474 			if (is_pairwise) {
2498
-				RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
2499
-					 "set Pairwise key\n");
2475
+				rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
2476
+					"set Pairwise key\n");
25002477 
25012478 				rtl_cam_add_one_entry(hw, macaddr, key_index,
25022479 					entry_id, enc_algo,
25032480 					CAM_CONFIG_NO_USEDK,
25042481 					rtlpriv->sec.key_buf[key_index]);
25052482 			} else {
2506
-				RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
2507
-					 "set group key\n");
2483
+				rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,
2484
+					"set group key\n");
25082485 
25092486 				if (mac->opmode == NL80211_IFTYPE_ADHOC) {
25102487 					rtl_cam_add_one_entry(hw,