Commit fca8218d authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: rtl8192se Rename RT_TRACE to rtl_dbg 



Change the misleading macro name to one that is more descriptive for
rtl8192se. Changes suggested by ckeckpatch.pl have been made.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200723204244.24457-11-Larry.Finger@lwfinger.net
parent e24a2a87

drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.c

+21 −21
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static void _rtl92s_dm_txpowertracking_callback_thermalmeter( 


	thermalvalue = (u8)rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER, 0x1f);



	RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

		"Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermal meter 0x%x\n",

		thermalvalue,

		rtlpriv->dm.thermalvalue, rtlefuse->eeprom_thermalmeter);
@@ -158,7 +158,7 @@ static void _rtl92s_dm_txpowertracking_callback_thermalmeter( 
				 (rtlpriv->efuse.thermalmeter[0] << 8) |

				 (thermalvalue << 16));



			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,

				"Write to FW Thermal Val = 0x%x\n", fw_cmd);



			rtl_write_dword(rtlpriv, WFM5, fw_cmd);
@@ -264,7 +264,7 @@ static void _rtl92s_dm_refresh_rateadaptive_mask(struct ieee80211_hw *hw) 
		}



		if (ra->pre_ratr_state != ra->ratr_state) {

			RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_RATE, DBG_LOUD,

				"RSSI = %ld RSSI_LEVEL = %d PreState = %d, CurState = %d\n",

				rtlpriv->dm.undec_sm_pwdb, ra->ratr_state,

				ra->pre_ratr_state, ra->ratr_state);
@@ -576,7 +576,7 @@ static void _rtl92s_dm_dynamic_txpower(struct ieee80211_hw *hw) 


	if ((mac->link_state < MAC80211_LINKED) &&

	    (rtlpriv->dm.entry_min_undec_sm_pwdb == 0)) {

		RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_POWER, DBG_TRACE,

			"Not connected to any\n");



		rtlpriv->dm.dynamic_txhighpower_lvl = TX_HIGHPWR_LEVEL_NORMAL;
@@ -588,19 +588,19 @@ static void _rtl92s_dm_dynamic_txpower(struct ieee80211_hw *hw) 
	if (mac->link_state >= MAC80211_LINKED) {

		if (mac->opmode == NL80211_IFTYPE_ADHOC) {

			undec_sm_pwdb = rtlpriv->dm.entry_min_undec_sm_pwdb;

			RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

				"AP Client PWDB = 0x%lx\n",

				undec_sm_pwdb);

		} else {

			undec_sm_pwdb = rtlpriv->dm.undec_sm_pwdb;

			RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

				"STA Default Port PWDB = 0x%lx\n",

				undec_sm_pwdb);

		}

	} else {

		undec_sm_pwdb = rtlpriv->dm.entry_min_undec_sm_pwdb;



		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD,

			"AP Ext Port PWDB = 0x%lx\n",

			undec_sm_pwdb);

	}

drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c

+20 −20
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static bool _rtl92s_firmware_enable_cpu(struct ieee80211_hw *hw) 
	do {

		cpustatus = rtl_read_byte(rtlpriv, TCR);

		if (cpustatus & IMEM_RDY) {

			RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

				"IMEM Ready after CPU has refilled\n");

			break;

		}
@@ -195,7 +195,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw, 
	short pollingcnt = 1000;

	bool rtstatus = true;



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"LoadStaus(%d)\n", loadfw_status);



	firmware->fwstatus = (enum fw_status)loadfw_status;
@@ -256,7 +256,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw, 
			goto status_check_fail;

		}



		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

			"DMEM code download success, cpustatus(%#x)\n",

			cpustatus);
@@ -270,7 +270,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw, 
			udelay(40);

		} while (pollingcnt--);



		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

			"Polling Load Firmware ready, cpustatus(%x)\n",

			cpustatus);
@@ -290,7 +290,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw, 
		rtl_write_dword(rtlpriv, RCR, (tmpu4b | RCR_APPFCS |

				RCR_APP_ICV | RCR_APP_MIC));



		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

			"Current RCR settings(%#x)\n", tmpu4b);



		/* Set to normal mode. */
@@ -304,7 +304,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw, 
	}



status_check_fail:

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"loadfw_status(%d), rtstatus(%x)\n",

		loadfw_status, rtstatus);

	return rtstatus;
@@ -337,7 +337,7 @@ int rtl92s_download_fw(struct ieee80211_hw *hw) 
	firmware->firmwareversion =  byte(pfwheader->version, 0);

	firmware->pfwheader->fwpriv.hci_sel = 1;/* pcie */



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"signature:%x, version:%x, size:%x, imemsize:%x, sram size:%x\n",

		pfwheader->signature,

		pfwheader->version, pfwheader->dmem_size,

drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c

+78 −79
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
	case HW_VAR_SLOT_TIME:{

			u8 e_aci;



			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,

				"HW_VAR_SLOT_TIME %x\n", val[0]);



			rtl_write_byte(rtlpriv, SLOT_TIME, val[0]);
@@ -156,7 +156,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 


				*val = min_spacing_to_set;



				RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,

				rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,

					"Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",

					mac->min_space_cfg);
@@ -172,7 +172,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
			mac->min_space_cfg = rtlpriv->rtlhal.minspace_cfg;

			mac->min_space_cfg |= (density_to_set << 3);



			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,

				"Set HW_VAR_SHORTGI_DENSITY: %#x\n",

				mac->min_space_cfg);
@@ -215,7 +215,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
					    (factorlevel[17] << 4));

				rtl_write_byte(rtlpriv, AGGLEN_LMT_H, regtoset);



				RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,

				rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD,

					"Set HW_VAR_AMPDU_FACTOR: %#x\n",

					factor_toset);

			}
@@ -253,7 +253,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
					acm_ctrl |= ACMHW_VOQEN;

					break;

				default:

					RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

					rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

						"HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",

						acm);

					break;
@@ -276,7 +276,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
				}

			}



			RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,

			rtl_dbg(rtlpriv, COMP_QOS, DBG_TRACE,

				"HW_VAR_ACM_CTRL Write 0x%X\n", acm_ctrl);

			rtl_write_byte(rtlpriv, ACMHWCTRL, acm_ctrl);

			break;
@@ -417,13 +417,13 @@ void rtl92se_enable_hw_security_config(struct ieee80211_hw *hw) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	u8 sec_reg_value = 0x0;



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",

		rtlpriv->sec.pairwise_enc_algorithm,

		rtlpriv->sec.group_enc_algorithm);



	if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {

		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

			"not open hw encryption\n");

		return;

	}
@@ -435,7 +435,7 @@ void rtl92se_enable_hw_security_config(struct ieee80211_hw *hw) 
		sec_reg_value |= SCR_RXUSEDK;

	}



	RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "The SECR-value %x\n",

	rtl_dbg(rtlpriv, COMP_SEC, DBG_LOUD, "The SECR-value %x\n",

		sec_reg_value);



	rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
@@ -870,10 +870,10 @@ static void _rtl92se_macconfig_after_fwdownload(struct ieee80211_hw *hw) 


		/* Change Program timing */

		rtl_write_byte(rtlpriv, REG_EFUSE_CTRL + 3, 0x72);

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "EFUSE CONFIG OK\n");

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "EFUSE CONFIG OK\n");

	}



	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "OK\n");

	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "OK\n");



}
@@ -960,9 +960,8 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) 
	/* 2. download firmware */

	rtstatus = rtl92s_download_fw(hw);

	if (!rtstatus) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

			 "Failed to download FW. Init HW without FW now... "

			 "Please copy FW into /lib/firmware/rtlwifi\n");

		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

			"Failed to download FW. Init HW without FW now... Please copy FW into /lib/firmware/rtlwifi\n");

		err = 1;

		goto exit;

	}
@@ -1014,7 +1013,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) 
		rtl_write_byte(rtlpriv, RF_CTRL, 0x07);



	if (!rtl92s_phy_rf_config(hw)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "RF Config failed\n");

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "RF Config failed\n");

		err = rtstatus;

		goto exit;

	}
@@ -1147,22 +1146,22 @@ static int _rtl92se_set_media_status(struct ieee80211_hw *hw, 
	switch (type) {

	case NL80211_IFTYPE_UNSPECIFIED:

		bt_msr |= (MSR_LINK_NONE << MSR_LINK_SHIFT);

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

			"Set Network type to NO LINK!\n");

		break;

	case NL80211_IFTYPE_ADHOC:

		bt_msr |= (MSR_LINK_ADHOC << MSR_LINK_SHIFT);

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

			"Set Network type to Ad Hoc!\n");

		break;

	case NL80211_IFTYPE_STATION:

		bt_msr |= (MSR_LINK_MANAGED << MSR_LINK_SHIFT);

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

			"Set Network type to STA!\n");

		break;

	case NL80211_IFTYPE_AP:

		bt_msr |= (MSR_LINK_MASTER << MSR_LINK_SHIFT);

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

		rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,

			"Set Network type to AP!\n");

		break;

	default:
@@ -1606,7 +1605,7 @@ void rtl92se_update_interrupt_mask(struct ieee80211_hw *hw, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));



	RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD, "add_msr:%x, rm_msr:%x\n",

	rtl_dbg(rtlpriv, COMP_INTR, DBG_LOUD, "add_msr:%x, rm_msr:%x\n",

		add_msr, rm_msr);



	if (add_msr)
@@ -1671,11 +1670,11 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw) 


	eeprom_id = *((u16 *)&hwinfo[0]);

	if (eeprom_id != RTL8190_EEPROM_ID) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

		rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,

			"EEPROM ID(%#x) is invalid!!\n", eeprom_id);

		rtlefuse->autoload_failflag = true;

	} else {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");

		rtlefuse->autoload_failflag = false;

	}
@@ -1692,15 +1691,15 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw) 
	rtlefuse->eeprom_smid = *(u16 *)&hwinfo[EEPROM_SMID];

	rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"EEPROMId = 0x%4x\n", eeprom_id);

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

		"EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);



	for (i = 0; i < 6; i += 2) {
@@ -1711,7 +1710,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw) 
	for (i = 0; i < 6; i++)

		rtl_write_byte(rtlpriv, MACIDR0 + i, rtlefuse->dev_addr[i]);



	RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);

	rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);



	/* Get Tx Power Level by Channel */

	/* Read Tx power of Channel 1 ~ 14 from EEPROM. */
@@ -1964,14 +1963,14 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw) 
		tempval = rtl_read_byte(rtlpriv, 0x07);

		if (!(tempval & BIT(0))) {

			rtlefuse->b1x1_recvcombine = true;

			RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

			rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,

				"RF_TYPE=1T2R but only 1SS\n");

		}

	}

	rtlefuse->b1ss_support = rtlefuse->b1x1_recvcombine;

	rtlefuse->eeprom_oemid = *&hwinfo[EEPROM_CUSTOMID];



	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x\n",

	rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x\n",

		rtlefuse->eeprom_oemid);



	/* set channel paln to world wide 13 */
@@ -1987,15 +1986,15 @@ void rtl92se_read_eeprom_info(struct ieee80211_hw *hw) 
	tmp_u1b = rtl_read_byte(rtlpriv, EPROM_CMD);



	if (tmp_u1b & BIT(4)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");

		rtlefuse->epromtype = EEPROM_93C46;

	} else {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");

		rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");

		rtlefuse->epromtype = EEPROM_BOOT_EFUSE;

	}



	if (tmp_u1b & BIT(5)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");

		rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");

		rtlefuse->autoload_failflag = false;

		_rtl92se_read_adapter_info(hw);

	} else {
@@ -2101,7 +2100,7 @@ static void rtl92se_update_hal_rate_table(struct ieee80211_hw *hw, 
	else

		rtl92s_phy_set_fw_cmd(hw, FW_CMD_RA_REFRESH_BG);



	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",

	rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",

		rtl_read_dword(rtlpriv, ARFR0));

}
@@ -2256,7 +2255,7 @@ static void rtl92se_update_hal_rate_mask(struct ieee80211_hw *hw, 


	mask |= (bmulticast ? 1 : 0) << 9 | (macid & 0x1f) << 4 | (band & 0xf);



	RT_TRACE(rtlpriv, COMP_RATR, DBG_TRACE, "mask = %x, bitmap = %x\n",

	rtl_dbg(rtlpriv, COMP_RATR, DBG_TRACE, "mask = %x, bitmap = %x\n",

		mask, ratr_bitmap);

	rtl_write_dword(rtlpriv, 0x2c4, ratr_bitmap);

	rtl_write_dword(rtlpriv, WFM5, (FW_RA_UPDATE_MASK | (mask << 8)));
@@ -2332,14 +2331,14 @@ bool rtl92se_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) 
	rfpwr_toset = _rtl92se_rf_onoff_detect(hw);



	if ((ppsc->hwradiooff) && (rfpwr_toset == ERFON)) {

		RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,

		rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG,

			"RFKILL-HW Radio ON, RF ON\n");



		rfpwr_toset = ERFON;

		ppsc->hwradiooff = false;

		actuallyset = true;

	} else if ((!ppsc->hwradiooff) && (rfpwr_toset == ERFOFF)) {

		RT_TRACE(rtlpriv, COMP_RF,

		rtl_dbg(rtlpriv, COMP_RF,

			DBG_DMESG, "RFKILL-HW Radio OFF, RF OFF\n");



		rfpwr_toset = ERFOFF;
@@ -2404,7 +2403,7 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr, 
		u8 cam_offset = 0;

		u8 clear_number = 5;



		RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");

		rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");



		for (idx = 0; idx < clear_number; idx++) {

			rtl_cam_mark_invalid(hw, cam_offset + idx);
@@ -2463,17 +2462,17 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr, 
		}



		if (rtlpriv->sec.key_len[key_index] == 0) {

			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

				"delete one entry, entry_id is %d\n",

				entry_id);

			if (mac->opmode == NL80211_IFTYPE_AP)

				rtl_cam_del_entry(hw, p_macaddr);

			rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);

		} else {

			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

			rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

				"add one entry\n");

			if (is_pairwise) {

				RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

				rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

					"set Pairwise key\n");



				rtl_cam_add_one_entry(hw, macaddr, key_index,
@@ -2481,7 +2480,7 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr, 
					CAM_CONFIG_NO_USEDK,

					rtlpriv->sec.key_buf[key_index]);

			} else {

				RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

				rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG,

					"set group key\n");



				if (mac->opmode == NL80211_IFTYPE_ADHOC) {

drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c

+5 −5
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ void rtl92se_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled) 
	u8 ledcfg;

	struct rtl_priv *rtlpriv = rtl_priv(hw);



	RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",

	rtl_dbg(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",

		LEDCFG, pled->ledpin);



	ledcfg = rtl_read_byte(rtlpriv, LEDCFG);
@@ -57,7 +57,7 @@ void rtl92se_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) 
	rtlpriv = rtl_priv(hw);

	if (!rtlpriv || rtlpriv->max_fw_size)

		return;

	RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",

	rtl_dbg(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",

		LEDCFG, pled->ledpin);



	ledcfg = rtl_read_byte(rtlpriv, LEDCFG);
@@ -119,7 +119,7 @@ void rtl92se_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction) 
	    ledaction == LED_CTL_POWER_ON)) {

		return;

	}

	RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d\n", ledaction);

	rtl_dbg(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d\n", ledaction);



	_rtl92se_sw_led_control(hw, ledaction);

}

drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c

+105 −106

File changed.

Preview size limit exceeded, changes collapsed.