Commit 2445e3a5 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Rename RTLLIB_LINKED to MAC80211_LINKED 



Rename RTLLIB_LINKED to MAC80211_LINKED to align with rtlwifi driver.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/532bd98301657b2a8329e95eccb993540ae9ba3f.1687007788.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fff6e869

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+5 −5
Original line number Diff line number Diff line
@@ -52,15 +52,15 @@ static void _rtl92e_update_msr(struct net_device *dev) 


	switch (priv->rtllib->iw_mode) {

	case IW_MODE_INFRA:

		if (priv->rtllib->link_state == RTLLIB_LINKED)

		if (priv->rtllib->link_state == MAC80211_LINKED)

			msr |= MSR_LINK_MANAGED;

		break;

	case IW_MODE_ADHOC:

		if (priv->rtllib->link_state == RTLLIB_LINKED)

		if (priv->rtllib->link_state == MAC80211_LINKED)

			msr |= MSR_LINK_ADHOC;

		break;

	case IW_MODE_MASTER:

		if (priv->rtllib->link_state == RTLLIB_LINKED)

		if (priv->rtllib->link_state == MAC80211_LINKED)

			msr |= MSR_LINK_MASTER;

		break;

	default:
@@ -745,7 +745,7 @@ void rtl92e_link_change(struct net_device *dev) 
	if (!priv->up)

		return;



	if (ieee->link_state == RTLLIB_LINKED) {

	if (ieee->link_state == MAC80211_LINKED) {

		_rtl92e_net_update(dev);

		rtl92e_update_ratr_table(dev);

		if ((ieee->pairwise_key_type == KEY_TYPE_WEP40) ||
@@ -760,7 +760,7 @@ void rtl92e_link_change(struct net_device *dev) 
		u32 reg;



		reg = rtl92e_readl(dev, RCR);

		if (priv->rtllib->link_state == RTLLIB_LINKED) {

		if (priv->rtllib->link_state == MAC80211_LINKED) {

			if (ieee->intel_promiscuous_md_info.promiscuous_on)

				;

			else

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+15 −15
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, 
		    (priv->rtllib->iw_mode == IW_MODE_ADHOC)) {

			if ((priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) ||

			    (change_source > RF_CHANGE_BY_IPS)) {

				if (ieee->link_state == RTLLIB_LINKED)

				if (ieee->link_state == MAC80211_LINKED)

					priv->blinked_ingpio = true;

				else

					priv->blinked_ingpio = false;
@@ -327,7 +327,7 @@ static void _rtl92e_qos_activate(void *data) 
	int i;



	mutex_lock(&priv->mutex);

	if (priv->rtllib->link_state != RTLLIB_LINKED)

	if (priv->rtllib->link_state != MAC80211_LINKED)

		goto success;



	for (i = 0; i <  QOS_QUEUE_NUM; i++)
@@ -344,7 +344,7 @@ static int _rtl92e_qos_handle_probe_response(struct r8192_priv *priv, 
	int ret = 0;

	u32 size = sizeof(struct rtllib_qos_parameters);



	if (priv->rtllib->link_state != RTLLIB_LINKED)

	if (priv->rtllib->link_state != MAC80211_LINKED)

		return ret;



	if (priv->rtllib->iw_mode != IW_MODE_INFRA)
@@ -400,7 +400,7 @@ static int _rtl92e_qos_assoc_resp(struct r8192_priv *priv, 
	if (!priv || !network)

		return 0;



	if (priv->rtllib->link_state != RTLLIB_LINKED)

	if (priv->rtllib->link_state != MAC80211_LINKED)

		return 0;



	if (priv->rtllib->iw_mode != IW_MODE_INFRA)
@@ -635,7 +635,7 @@ static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset) 
	if (priv->polling_timer_on == 0)

		rtl92e_check_rfctrl_gpio_timer(&priv->gpio_polling_timer);



	if (priv->rtllib->link_state != RTLLIB_LINKED)

	if (priv->rtllib->link_state != MAC80211_LINKED)

		rtllib_softmac_start_protocol(priv->rtllib, 0);

	rtllib_reset_queue(priv->rtllib);

	_rtl92e_watchdog_timer_cb(&priv->watch_dog_timer);
@@ -660,7 +660,7 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf) 


	priv->rtllib->rtllib_ips_leave(dev);



	if (priv->rtllib->link_state == RTLLIB_LINKED)

	if (priv->rtllib->link_state == MAC80211_LINKED)

		rtl92e_leisure_ps_leave(dev);



	priv->up = 0;
@@ -1009,7 +1009,7 @@ static enum reset_type _rtl92e_if_check_reset(struct net_device *dev) 


	if (rfState == rf_on &&

	    (priv->rtllib->iw_mode == IW_MODE_INFRA) &&

	    (priv->rtllib->link_state == RTLLIB_LINKED))

	    (priv->rtllib->link_state == MAC80211_LINKED))

		RxResetType = _rtl92e_rx_check_stuck(dev);



	if (TxResetType == RESET_TYPE_NORMAL ||
@@ -1051,7 +1051,7 @@ static void _rtl92e_if_silent_reset(struct net_device *dev) 


		mutex_lock(&priv->wx_mutex);



		if (priv->rtllib->link_state == RTLLIB_LINKED)

		if (priv->rtllib->link_state == MAC80211_LINKED)

			rtl92e_leisure_ps_leave(dev);



		if (priv->up) {
@@ -1073,9 +1073,9 @@ static void _rtl92e_if_silent_reset(struct net_device *dev) 
		rtl92e_dm_deinit(dev);

		rtllib_stop_scan_syncro(ieee);



		if (ieee->link_state == RTLLIB_LINKED) {

		if (ieee->link_state == MAC80211_LINKED) {

			mutex_lock(&ieee->wx_mutex);

			netdev_info(dev, "ieee->link_state is RTLLIB_LINKED\n");

			netdev_info(dev, "ieee->link_state is MAC80211_LINKED\n");

			rtllib_stop_send_beacons(priv->rtllib);

			del_timer_sync(&ieee->associate_timer);

			cancel_delayed_work(&ieee->associate_retry_wq);
@@ -1110,14 +1110,14 @@ static void _rtl92e_if_silent_reset(struct net_device *dev) 


		rtl92e_enable_hw_security_config(dev);



		if (ieee->link_state == RTLLIB_LINKED && ieee->iw_mode ==

		if (ieee->link_state == MAC80211_LINKED && ieee->iw_mode ==

		    IW_MODE_INFRA) {

			ieee->set_chan(ieee->dev,

				       ieee->current_network.channel);



			schedule_work(&ieee->associate_complete_wq);



		} else if (ieee->link_state == RTLLIB_LINKED && ieee->iw_mode ==

		} else if (ieee->link_state == MAC80211_LINKED && ieee->iw_mode ==

			   IW_MODE_ADHOC) {

			ieee->set_chan(ieee->dev,

				       ieee->current_network.channel);
@@ -1181,7 +1181,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) 
	if (!priv->up || priv->hw_radio_off)

		return;



	if (priv->rtllib->link_state >= RTLLIB_LINKED) {

	if (priv->rtllib->link_state >= MAC80211_LINKED) {

		if (priv->rtllib->CntAfterLink < 2)

			priv->rtllib->CntAfterLink++;

	} else {
@@ -1202,7 +1202,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) 
			}

		}

	}

	if ((ieee->link_state == RTLLIB_LINKED) && (ieee->iw_mode ==

	if ((ieee->link_state == MAC80211_LINKED) && (ieee->iw_mode ==

	     IW_MODE_INFRA) && (!ieee->net_promiscuous_md)) {

		if (ieee->link_detect_info.NumRxOkInPeriod > 100 ||

		ieee->link_detect_info.NumTxOkInPeriod > 100)
@@ -1244,7 +1244,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) 
	ieee->link_detect_info.bHigherBusyTraffic = bHigherBusyTraffic;

	ieee->link_detect_info.bHigherBusyRxTraffic = bHigherBusyRxTraffic;



	if (ieee->link_state == RTLLIB_LINKED && ieee->iw_mode == IW_MODE_INFRA) {

	if (ieee->link_state == MAC80211_LINKED && ieee->iw_mode == IW_MODE_INFRA) {

		u32	TotalRxBcnNum = 0;

		u32	TotalRxDataNum = 0;

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+8 −8
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev) 
	if (priv->rtllib->mode != WIRELESS_MODE_N_24G)

		return;



	if (priv->rtllib->link_state == RTLLIB_LINKED) {

	if (priv->rtllib->link_state == MAC80211_LINKED) {

		bshort_gi_enabled = (ht_info->cur_tx_bw40mhz &&

				     ht_info->bCurShortGI40MHz) ||

				    (!ht_info->cur_tx_bw40mhz &&
@@ -1075,7 +1075,7 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_driver(struct net_device *dev) 
		dm_digtable.dig_state = DM_STA_DIG_OFF;

	}



	if (priv->rtllib->link_state == RTLLIB_LINKED)

	if (priv->rtllib->link_state == MAC80211_LINKED)

		dm_digtable.cur_sta_connect_state = DIG_STA_CONNECT;

	else

		dm_digtable.cur_sta_connect_state = DIG_STA_DISCONNECT;
@@ -1105,7 +1105,7 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(struct net_device *dev) 
		dm_digtable.dig_algorithm_switch = 0;

	}



	if (priv->rtllib->link_state != RTLLIB_LINKED)

	if (priv->rtllib->link_state != MAC80211_LINKED)

		return;



	if ((priv->undecorated_smoothed_pwdb > dm_digtable.rssi_low_thresh) &&
@@ -1406,7 +1406,7 @@ static void _rtl92e_dm_check_edca_turbo(struct net_device *dev) 


	if (priv->rtllib->iw_mode == IW_MODE_ADHOC)

		goto dm_CheckEdcaTurbo_EXIT;

	if (priv->rtllib->link_state != RTLLIB_LINKED)

	if (priv->rtllib->link_state != MAC80211_LINKED)

		goto dm_CheckEdcaTurbo_EXIT;

	if (priv->rtllib->ht_info->iot_action & HT_IOT_ACT_DISABLE_EDCA_TURBO)

		goto dm_CheckEdcaTurbo_EXIT;
@@ -1820,7 +1820,7 @@ static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t) 
	bool		bSwitchFromCountDiff = false;

	bool		bDoubleTimeInterval = false;



	if (priv->rtllib->link_state == RTLLIB_LINKED &&

	if (priv->rtllib->link_state == MAC80211_LINKED &&

	    priv->rtllib->bfsync_enable &&

	    (priv->rtllib->ht_info->iot_action & HT_IOT_ACT_CDD_FSYNC)) {

		u32 rate_bitmap;
@@ -1990,7 +1990,7 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev) 
	static u8 reg_c38_State = RegC38_Default;

	static u32 reset_cnt;



	if (priv->rtllib->link_state == RTLLIB_LINKED &&

	if (priv->rtllib->link_state == MAC80211_LINKED &&

	    priv->rtllib->ht_info->IOTPeer == HT_IOT_PEER_BROADCOM) {

		if (priv->rtllib->bfsync_enable == 0) {

			switch (priv->rtllib->fsync_state) {
@@ -2043,7 +2043,7 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev) 
			break;

		}



		if (priv->rtllib->link_state == RTLLIB_LINKED) {

		if (priv->rtllib->link_state == MAC80211_LINKED) {

			if (priv->undecorated_smoothed_pwdb <=

			    RegC38_TH) {

				if (reg_c38_State !=
@@ -2112,7 +2112,7 @@ static void _rtl92e_dm_dynamic_tx_power(struct net_device *dev) 
		txlowpower_threshold = TX_POWER_NEAR_FIELD_THRESH_LOW;

	}



	if (priv->rtllib->link_state == RTLLIB_LINKED) {

	if (priv->rtllib->link_state == MAC80211_LINKED) {

		if (priv->undecorated_smoothed_pwdb >= txhipower_threshold) {

			priv->dynamic_tx_high_pwr = true;

			priv->dynamic_tx_low_pwr = false;

drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static u32 _rtl92e_ethtool_get_link(struct net_device *dev) 
{

	struct r8192_priv *priv = rtllib_priv(dev);



	return ((priv->rtllib->link_state == RTLLIB_LINKED) ||

	return ((priv->rtllib->link_state == MAC80211_LINKED) ||

		(priv->rtllib->link_state == RTLLIB_LINKED_SCANNING));

}

drivers/staging/rtl8192e/rtl8192e/rtl_ps.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ void rtl92e_ips_enter(struct net_device *dev) 


	rt_state = priv->rtllib->rf_power_state;

	if (rt_state == rf_on && !psc->bSwRfProcessing &&

		(priv->rtllib->link_state != RTLLIB_LINKED) &&

		(priv->rtllib->link_state != MAC80211_LINKED) &&

		(priv->rtllib->iw_mode != IW_MODE_MASTER)) {

		psc->eInactivePowerState = rf_off;

		_rtl92e_ps_update_rf_state(dev);
@@ -209,7 +209,7 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) 
					&priv->rtllib->pwr_save_ctrl;



	if (!((priv->rtllib->iw_mode == IW_MODE_INFRA) &&

	    (priv->rtllib->link_state == RTLLIB_LINKED))

	    (priv->rtllib->link_state == MAC80211_LINKED))

	    || (priv->rtllib->iw_mode == IW_MODE_ADHOC) ||

	    (priv->rtllib->iw_mode == IW_MODE_MASTER))

		return;