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

rtlwifi: Move items out of rtl_pci_priv and rtl_usb_priv 



In commit 6773386f ("rtlwifi: rtl8192c-common: Fix "BUG: KASAN:"),
a BUG detected when CONFIG_KASAN=y was fixed by reordering the layouts
of struct rtl_pci_priv, and struct rtl_usb_priv so that the variables
used by both PCI and USB drivers have the same offsets in both structs.
The better fix of relocating the critical variables into struct rtl_priv
was deferred as these changes do not have to be applied to stable
kernels.

This change also removes CamelCase variables with pLed0 => pled0.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d0630555

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

+6 −8
Original line number Diff line number Diff line
@@ -817,19 +817,18 @@ static bool _rtl88ee_llt_table_init(struct ieee80211_hw *hw) 
static void _rtl88ee_gen_refresh_led_state(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);

	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));

	struct rtl_led *pLed0 = &(pcipriv->ledctl.sw_led0);

	struct rtl_led *pled0 = &rtlpriv->ledctl.sw_led0;



	if (rtlpriv->rtlhal.up_first_time)

		return;



	if (ppsc->rfoff_reason == RF_CHANGE_BY_IPS)

		rtl88ee_sw_led_on(hw, pLed0);

		rtl88ee_sw_led_on(hw, pled0);

	else if (ppsc->rfoff_reason == RF_CHANGE_BY_INIT)

		rtl88ee_sw_led_on(hw, pLed0);

		rtl88ee_sw_led_on(hw, pled0);

	else

		rtl88ee_sw_led_off(hw, pLed0);

		rtl88ee_sw_led_off(hw, pled0);

}



static bool _rtl88ee_init_mac(struct ieee80211_hw *hw)
@@ -1931,14 +1930,13 @@ exit: 
static void _rtl88ee_hal_customized_behavior(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);

	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));



	pcipriv->ledctl.led_opendrain = true;

	rtlpriv->ledctl.led_opendrain = true;



	switch (rtlhal->oem_id) {

	case RT_CID_819X_HP:

		pcipriv->ledctl.led_opendrain = true;

		rtlpriv->ledctl.led_opendrain = true;

		break;

	case RT_CID_819X_LENOVO:

	case RT_CID_DEFAULT:

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

+10 −9
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ void rtl88ee_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled) 
void rtl88ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);

	u8 ledcfg;



	RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
@@ -79,7 +78,7 @@ void rtl88ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) 
	case LED_PIN_LED0:

		ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);

		ledcfg &= 0xf0;

		if (pcipriv->ledctl.led_opendrain) {

		if (rtlpriv->ledctl.led_opendrain) {

			rtl_write_byte(rtlpriv, REG_LEDCFG2,

				       (ledcfg | BIT(3) | BIT(5) | BIT(6)));

			ledcfg = rtl_read_byte(rtlpriv, REG_MAC_PINMUX_CFG);
@@ -104,24 +103,26 @@ void rtl88ee_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) 


void rtl88ee_init_sw_leds(struct ieee80211_hw *hw)

{

	struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);

	_rtl88ee_init_led(hw, &pcipriv->ledctl.sw_led0, LED_PIN_LED0);

	_rtl88ee_init_led(hw, &pcipriv->ledctl.sw_led1, LED_PIN_LED1);

	struct rtl_priv *rtlpriv = rtl_priv(hw);



	_rtl88ee_init_led(hw, &rtlpriv->ledctl.sw_led0, LED_PIN_LED0);

	_rtl88ee_init_led(hw, &rtlpriv->ledctl.sw_led1, LED_PIN_LED1);

}



static void _rtl88ee_sw_led_control(struct ieee80211_hw *hw,

				    enum led_ctl_mode ledaction)

{

	struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);

	struct rtl_led *pLed0 = &(pcipriv->ledctl.sw_led0);

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_led *pled0 = &rtlpriv->ledctl.sw_led0;



	switch (ledaction) {

	case LED_CTL_POWER_ON:

	case LED_CTL_LINK:

	case LED_CTL_NO_LINK:

		rtl88ee_sw_led_on(hw, pLed0);

		rtl88ee_sw_led_on(hw, pled0);

		break;

	case LED_CTL_POWER_OFF:

		rtl88ee_sw_led_off(hw, pLed0);

		rtl88ee_sw_led_off(hw, pled0);

		break;

	default:

		break;

drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c

+67 −76
Original line number Diff line number Diff line
@@ -638,7 +638,6 @@ EXPORT_SYMBOL(rtl92c_dm_init_edca_turbo); 
static void rtl92c_dm_check_edca_turbo(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);

	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));



	static u64 last_txok_cnt;
@@ -651,20 +650,20 @@ static void rtl92c_dm_check_edca_turbo(struct ieee80211_hw *hw) 
	u32 edca_be_dl = 0x5ea42b;

	bool bt_change_edca = false;



	if ((last_bt_edca_ul != rtlpcipriv->bt_coexist.bt_edca_ul) ||

	    (last_bt_edca_dl != rtlpcipriv->bt_coexist.bt_edca_dl)) {

	if ((last_bt_edca_ul != rtlpriv->btcoexist.bt_edca_ul) ||

	    (last_bt_edca_dl != rtlpriv->btcoexist.bt_edca_dl)) {

		rtlpriv->dm.current_turbo_edca = false;

		last_bt_edca_ul = rtlpcipriv->bt_coexist.bt_edca_ul;

		last_bt_edca_dl = rtlpcipriv->bt_coexist.bt_edca_dl;

		last_bt_edca_ul = rtlpriv->btcoexist.bt_edca_ul;

		last_bt_edca_dl = rtlpriv->btcoexist.bt_edca_dl;

	}



	if (rtlpcipriv->bt_coexist.bt_edca_ul != 0) {

		edca_be_ul = rtlpcipriv->bt_coexist.bt_edca_ul;

	if (rtlpriv->btcoexist.bt_edca_ul != 0) {

		edca_be_ul = rtlpriv->btcoexist.bt_edca_ul;

		bt_change_edca = true;

	}



	if (rtlpcipriv->bt_coexist.bt_edca_dl != 0) {

		edca_be_ul = rtlpcipriv->bt_coexist.bt_edca_dl;

	if (rtlpriv->btcoexist.bt_edca_dl != 0) {

		edca_be_ul = rtlpriv->btcoexist.bt_edca_dl;

		bt_change_edca = true;

	}
@@ -673,7 +672,7 @@ static void rtl92c_dm_check_edca_turbo(struct ieee80211_hw *hw) 
		return;

	}



	if ((!mac->ht_enable) && (!rtlpcipriv->bt_coexist.bt_coexistence)) {

	if ((!mac->ht_enable) && (!rtlpriv->btcoexist.bt_coexistence)) {

		if (!(edca_be_ul & 0xffff0000))

			edca_be_ul |= 0x005e0000;
@@ -1471,7 +1470,6 @@ EXPORT_SYMBOL(rtl92c_dm_watchdog); 
u8 rtl92c_bt_rssi_state_change(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);

	long undec_sm_pwdb;

	u8 curr_bt_rssi_state = 0x00;
@@ -1510,8 +1508,8 @@ u8 rtl92c_bt_rssi_state_change(struct ieee80211_hw *hw) 
	else

		curr_bt_rssi_state &= (~BT_RSSI_STATE_BG_EDCA_LOW);



	if (curr_bt_rssi_state != rtlpcipriv->bt_coexist.bt_rssi_state) {

		rtlpcipriv->bt_coexist.bt_rssi_state = curr_bt_rssi_state;

	if (curr_bt_rssi_state != rtlpriv->btcoexist.bt_rssi_state) {

		rtlpriv->btcoexist.bt_rssi_state = curr_bt_rssi_state;

		return true;

	} else {

		return false;
@@ -1522,7 +1520,6 @@ EXPORT_SYMBOL(rtl92c_bt_rssi_state_change); 
static bool rtl92c_bt_state_change(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);



	u32 polling, ratio_tx, ratio_pri;

	u32 bt_tx, bt_pri;
@@ -1542,14 +1539,14 @@ static bool rtl92c_bt_state_change(struct ieee80211_hw *hw) 
		return false;



	bt_state &= BIT_OFFSET_LEN_MASK_32(0, 1);

	if (bt_state != rtlpcipriv->bt_coexist.bt_cur_state) {

		rtlpcipriv->bt_coexist.bt_cur_state = bt_state;

	if (bt_state != rtlpriv->btcoexist.bt_cur_state) {

		rtlpriv->btcoexist.bt_cur_state = bt_state;



		if (rtlpcipriv->bt_coexist.reg_bt_sco == 3) {

			rtlpcipriv->bt_coexist.bt_service = BT_IDLE;

		if (rtlpriv->btcoexist.reg_bt_sco == 3) {

			rtlpriv->btcoexist.bt_service = BT_IDLE;



			bt_state = bt_state |

			  ((rtlpcipriv->bt_coexist.bt_ant_isolation == 1) ?

			  ((rtlpriv->btcoexist.bt_ant_isolation == 1) ?

			  0 : BIT_OFFSET_LEN_MASK_32(1, 1)) |

			  BIT_OFFSET_LEN_MASK_32(2, 1);

			rtl_write_byte(rtlpriv, 0x4fd, bt_state);
@@ -1559,10 +1556,10 @@ static bool rtl92c_bt_state_change(struct ieee80211_hw *hw) 


	ratio_tx = bt_tx * 1000 / polling;

	ratio_pri = bt_pri * 1000 / polling;

	rtlpcipriv->bt_coexist.ratio_tx = ratio_tx;

	rtlpcipriv->bt_coexist.ratio_pri = ratio_pri;

	rtlpriv->btcoexist.ratio_tx = ratio_tx;

	rtlpriv->btcoexist.ratio_pri = ratio_pri;



	if (bt_state && rtlpcipriv->bt_coexist.reg_bt_sco == 3) {

	if (bt_state && rtlpriv->btcoexist.reg_bt_sco == 3) {



		if ((ratio_tx < 30)  && (ratio_pri < 30))

			cur_service_type = BT_IDLE;
@@ -1577,17 +1574,17 @@ static bool rtl92c_bt_state_change(struct ieee80211_hw *hw) 
		else

			cur_service_type = BT_OTHER_ACTION;



		if (cur_service_type != rtlpcipriv->bt_coexist.bt_service) {

			rtlpcipriv->bt_coexist.bt_service = cur_service_type;

		if (cur_service_type != rtlpriv->btcoexist.bt_service) {

			rtlpriv->btcoexist.bt_service = cur_service_type;

			bt_state = bt_state |

			   ((rtlpcipriv->bt_coexist.bt_ant_isolation == 1) ?

			   ((rtlpriv->btcoexist.bt_ant_isolation == 1) ?

			   0 : BIT_OFFSET_LEN_MASK_32(1, 1)) |

			   ((rtlpcipriv->bt_coexist.bt_service != BT_IDLE) ?

			   ((rtlpriv->btcoexist.bt_service != BT_IDLE) ?

			   0 : BIT_OFFSET_LEN_MASK_32(2, 1));



			/* Add interrupt migration when bt is not ini

			 * idle state (no traffic). */

			if (rtlpcipriv->bt_coexist.bt_service != BT_IDLE) {

			if (rtlpriv->btcoexist.bt_service != BT_IDLE) {

				rtl_write_word(rtlpriv, 0x504, 0x0ccc);

				rtl_write_byte(rtlpriv, 0x506, 0x54);

				rtl_write_byte(rtlpriv, 0x507, 0x54);
@@ -1626,80 +1623,77 @@ static bool rtl92c_bt_wifi_connect_change(struct ieee80211_hw *hw) 
static void rtl92c_bt_set_normal(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);





	if (rtlpcipriv->bt_coexist.bt_service == BT_OTHERBUSY) {

		rtlpcipriv->bt_coexist.bt_edca_ul = 0x5ea72b;

		rtlpcipriv->bt_coexist.bt_edca_dl = 0x5ea72b;

	} else if (rtlpcipriv->bt_coexist.bt_service == BT_BUSY) {

		rtlpcipriv->bt_coexist.bt_edca_ul = 0x5eb82f;

		rtlpcipriv->bt_coexist.bt_edca_dl = 0x5eb82f;

	} else if (rtlpcipriv->bt_coexist.bt_service == BT_SCO) {

		if (rtlpcipriv->bt_coexist.ratio_tx > 160) {

			rtlpcipriv->bt_coexist.bt_edca_ul = 0x5ea72f;

			rtlpcipriv->bt_coexist.bt_edca_dl = 0x5ea72f;



	if (rtlpriv->btcoexist.bt_service == BT_OTHERBUSY) {

		rtlpriv->btcoexist.bt_edca_ul = 0x5ea72b;

		rtlpriv->btcoexist.bt_edca_dl = 0x5ea72b;

	} else if (rtlpriv->btcoexist.bt_service == BT_BUSY) {

		rtlpriv->btcoexist.bt_edca_ul = 0x5eb82f;

		rtlpriv->btcoexist.bt_edca_dl = 0x5eb82f;

	} else if (rtlpriv->btcoexist.bt_service == BT_SCO) {

		if (rtlpriv->btcoexist.ratio_tx > 160) {

			rtlpriv->btcoexist.bt_edca_ul = 0x5ea72f;

			rtlpriv->btcoexist.bt_edca_dl = 0x5ea72f;

		} else {

			rtlpcipriv->bt_coexist.bt_edca_ul = 0x5ea32b;

			rtlpcipriv->bt_coexist.bt_edca_dl = 0x5ea42b;

			rtlpriv->btcoexist.bt_edca_ul = 0x5ea32b;

			rtlpriv->btcoexist.bt_edca_dl = 0x5ea42b;

		}

	} else {

		rtlpcipriv->bt_coexist.bt_edca_ul = 0;

		rtlpcipriv->bt_coexist.bt_edca_dl = 0;

		rtlpriv->btcoexist.bt_edca_ul = 0;

		rtlpriv->btcoexist.bt_edca_dl = 0;

	}



	if ((rtlpcipriv->bt_coexist.bt_service != BT_IDLE) &&

	if ((rtlpriv->btcoexist.bt_service != BT_IDLE) &&

	    (rtlpriv->mac80211.mode == WIRELESS_MODE_G ||

	     (rtlpriv->mac80211.mode == (WIRELESS_MODE_G | WIRELESS_MODE_B))) &&

	     (rtlpcipriv->bt_coexist.bt_rssi_state &

	    (rtlpriv->btcoexist.bt_rssi_state &

	     BT_RSSI_STATE_BG_EDCA_LOW)) {

		rtlpcipriv->bt_coexist.bt_edca_ul = 0x5eb82b;

		rtlpcipriv->bt_coexist.bt_edca_dl = 0x5eb82b;

		rtlpriv->btcoexist.bt_edca_ul = 0x5eb82b;

		rtlpriv->btcoexist.bt_edca_dl = 0x5eb82b;

	}

}



static void rtl92c_bt_ant_isolation(struct ieee80211_hw *hw, u8 tmp1byte)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);





	/* Only enable HW BT coexist when BT in "Busy" state. */

	if (rtlpriv->mac80211.vendor == PEER_CISCO &&

	    rtlpcipriv->bt_coexist.bt_service == BT_OTHER_ACTION) {

	    rtlpriv->btcoexist.bt_service == BT_OTHER_ACTION) {

		rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, 0xa0);

	} else {

		if ((rtlpcipriv->bt_coexist.bt_service == BT_BUSY) &&

		    (rtlpcipriv->bt_coexist.bt_rssi_state &

		if ((rtlpriv->btcoexist.bt_service == BT_BUSY) &&

		    (rtlpriv->btcoexist.bt_rssi_state &

		     BT_RSSI_STATE_NORMAL_POWER)) {

			rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, 0xa0);

		} else if ((rtlpcipriv->bt_coexist.bt_service ==

		} else if ((rtlpriv->btcoexist.bt_service ==

			    BT_OTHER_ACTION) && (rtlpriv->mac80211.mode <

			    WIRELESS_MODE_N_24G) &&

			    (rtlpcipriv->bt_coexist.bt_rssi_state &

			    (rtlpriv->btcoexist.bt_rssi_state &

			    BT_RSSI_STATE_SPECIAL_LOW)) {

			rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, 0xa0);

		} else if (rtlpcipriv->bt_coexist.bt_service == BT_PAN) {

		} else if (rtlpriv->btcoexist.bt_service == BT_PAN) {

			rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, tmp1byte);

		} else {

			rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, tmp1byte);

		}

	}



	if (rtlpcipriv->bt_coexist.bt_service == BT_PAN)

	if (rtlpriv->btcoexist.bt_service == BT_PAN)

		rtl_write_dword(rtlpriv, REG_GPIO_PIN_CTRL, 0x10100);

	else

		rtl_write_dword(rtlpriv, REG_GPIO_PIN_CTRL, 0x0);



	if (rtlpcipriv->bt_coexist.bt_rssi_state &

	if (rtlpriv->btcoexist.bt_rssi_state &

	    BT_RSSI_STATE_NORMAL_POWER) {

		rtl92c_bt_set_normal(hw);

	} else {

		rtlpcipriv->bt_coexist.bt_edca_ul = 0;

		rtlpcipriv->bt_coexist.bt_edca_dl = 0;

		rtlpriv->btcoexist.bt_edca_ul = 0;

		rtlpriv->btcoexist.bt_edca_dl = 0;

	}



	if (rtlpcipriv->bt_coexist.bt_service != BT_IDLE) {

	if (rtlpriv->btcoexist.bt_service != BT_IDLE) {

		rtlpriv->cfg->ops->set_rfreg(hw,

				 RF90_PATH_A,

				 0x1e,
@@ -1707,12 +1701,12 @@ static void rtl92c_bt_ant_isolation(struct ieee80211_hw *hw, u8 tmp1byte) 
	} else {

		rtlpriv->cfg->ops->set_rfreg(hw,

		     RF90_PATH_A, 0x1e, 0xf0,

		     rtlpcipriv->bt_coexist.bt_rfreg_origin_1e);

		     rtlpriv->btcoexist.bt_rfreg_origin_1e);

	}



	if (!rtlpriv->dm.dynamic_txpower_enable) {

		if (rtlpcipriv->bt_coexist.bt_service != BT_IDLE) {

			if (rtlpcipriv->bt_coexist.bt_rssi_state &

		if (rtlpriv->btcoexist.bt_service != BT_IDLE) {

			if (rtlpriv->btcoexist.bt_rssi_state &

				BT_RSSI_STATE_TXPOWER_LOW) {

				rtlpriv->dm.dynamic_txhighpower_lvl =

							TXHIGHPWRLEVEL_BT2;
@@ -1732,37 +1726,34 @@ static void rtl92c_bt_ant_isolation(struct ieee80211_hw *hw, u8 tmp1byte) 
static void rtl92c_check_bt_change(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);

	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));

	u8 tmp1byte = 0;



	if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version) &&

	    rtlpcipriv->bt_coexist.bt_coexistence)

	    rtlpriv->btcoexist.bt_coexistence)

		tmp1byte |= BIT(5);

	if (rtlpcipriv->bt_coexist.bt_cur_state) {

		if (rtlpcipriv->bt_coexist.bt_ant_isolation)

	if (rtlpriv->btcoexist.bt_cur_state) {

		if (rtlpriv->btcoexist.bt_ant_isolation)

			rtl92c_bt_ant_isolation(hw, tmp1byte);

	} else {

		rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, tmp1byte);

		rtlpriv->cfg->ops->set_rfreg(hw, RF90_PATH_A, 0x1e, 0xf0,

				rtlpcipriv->bt_coexist.bt_rfreg_origin_1e);

				rtlpriv->btcoexist.bt_rfreg_origin_1e);



		rtlpcipriv->bt_coexist.bt_edca_ul = 0;

		rtlpcipriv->bt_coexist.bt_edca_dl = 0;

		rtlpriv->btcoexist.bt_edca_ul = 0;

		rtlpriv->btcoexist.bt_edca_dl = 0;

	}

}



void rtl92c_dm_bt_coexist(struct ieee80211_hw *hw)

{

	struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);



	struct rtl_priv *rtlpriv = rtl_priv(hw);

	bool wifi_connect_change;

	bool bt_state_change;

	bool rssi_state_change;



	if ((rtlpcipriv->bt_coexist.bt_coexistence) &&

	     (rtlpcipriv->bt_coexist.bt_coexist_type == BT_CSR_BC4)) {



	if ((rtlpriv->btcoexist.bt_coexistence) &&

	    (rtlpriv->btcoexist.bt_coexist_type == BT_CSR_BC4)) {

		wifi_connect_change = rtl92c_bt_wifi_connect_change(hw);

		bt_state_change = rtl92c_bt_state_change(hw);

		rssi_state_change = rtl92c_bt_rssi_state_change(hw);

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

+79 −87

File changed.

Preview size limit exceeded, changes collapsed.

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

+10 −9
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ void rtl92ce_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled) 
void rtl92ce_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);

	u8 ledcfg;



	RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
@@ -80,7 +79,7 @@ void rtl92ce_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) 
		break;

	case LED_PIN_LED0:

		ledcfg &= 0xf0;

		if (pcipriv->ledctl.led_opendrain)

		if (rtlpriv->ledctl.led_opendrain)

			rtl_write_byte(rtlpriv, REG_LEDCFG2,

				       (ledcfg | BIT(1) | BIT(5) | BIT(6)));

		else
@@ -100,24 +99,26 @@ void rtl92ce_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) 


void rtl92ce_init_sw_leds(struct ieee80211_hw *hw)

{

	struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);

	_rtl92ce_init_led(hw, &(pcipriv->ledctl.sw_led0), LED_PIN_LED0);

	_rtl92ce_init_led(hw, &(pcipriv->ledctl.sw_led1), LED_PIN_LED1);

	struct rtl_priv *rtlpriv = rtl_priv(hw);



	_rtl92ce_init_led(hw, &rtlpriv->ledctl.sw_led0, LED_PIN_LED0);

	_rtl92ce_init_led(hw, &rtlpriv->ledctl.sw_led1, LED_PIN_LED1);

}



static void _rtl92ce_sw_led_control(struct ieee80211_hw *hw,

				    enum led_ctl_mode ledaction)

{

	struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);

	struct rtl_led *pLed0 = &(pcipriv->ledctl.sw_led0);

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_led *pled0 = &rtlpriv->ledctl.sw_led0;



	switch (ledaction) {

	case LED_CTL_POWER_ON:

	case LED_CTL_LINK:

	case LED_CTL_NO_LINK:

		rtl92ce_sw_led_on(hw, pLed0);

		rtl92ce_sw_led_on(hw, pled0);

		break;

	case LED_CTL_POWER_OFF:

		rtl92ce_sw_led_off(hw, pLed0);

		rtl92ce_sw_led_off(hw, pled0);

		break;

	default:

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE