Commit 6628c674 authored by William Durand's avatar William Durand Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: rename RT2RT_HT_Mode to rt2rt_ht_mode in bss_ht struct 



Rename RT2RT_HT_Mode to rt2rt_ht_mode to silence a checkpatch warning
about CamelCase.

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarWilliam Durand <will+git@drnd.me>
Link: https://lore.kernel.org/r/20210220172909.15812-12-will+git@drnd.me


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

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static void _rtl92e_update_beacon(void *data) 
	if (ieee->pHTInfo->bCurrentHTSupport)

		HT_update_self_and_peer_setting(ieee, net);

	ieee->pHTInfo->bCurrentRT2RTLongSlotTime = net->bssht.bd_rt2rt_long_slot_time;

	ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.RT2RT_HT_Mode;

	ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.rt2rt_ht_mode;

	_rtl92e_update_cap(dev, net->capability);

}

drivers/staging/rtl8192e/rtl819x_HT.h

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ struct bss_ht { 


	u8					bd_rt2rt_aggregation;

	u8					bd_rt2rt_long_slot_time;

	u8					RT2RT_HT_Mode;

	u8					rt2rt_ht_mode;

	u8					bdHT1R;

};

drivers/staging/rtl8192e/rtl819x_HTProc.c

+4 −4
Original line number Diff line number Diff line
@@ -173,9 +173,9 @@ static void HTIOTPeerDetermine(struct rtllib_device *ieee) 


	if (net->bssht.bd_rt2rt_aggregation) {

		pHTInfo->IOTPeer = HT_IOT_PEER_REALTEK;

		if (net->bssht.RT2RT_HT_Mode & RT_HT_CAP_USE_92SE)

		if (net->bssht.rt2rt_ht_mode & RT_HT_CAP_USE_92SE)

			pHTInfo->IOTPeer = HT_IOT_PEER_REALTEK_92SE;

		if (net->bssht.RT2RT_HT_Mode & RT_HT_CAP_USE_SOFTAP)

		if (net->bssht.rt2rt_ht_mode & RT_HT_CAP_USE_SOFTAP)

			pHTInfo->IOTPeer = HT_IOT_PEER_92U_SOFTAP;

	} else if (net->broadcom_cap_exist) {

		pHTInfo->IOTPeer = HT_IOT_PEER_BROADCOM;
@@ -699,7 +699,7 @@ void HTInitializeBssDesc(struct bss_ht *pBssHT) 


	pBssHT->bd_rt2rt_aggregation = false;

	pBssHT->bd_rt2rt_long_slot_time = false;

	pBssHT->RT2RT_HT_Mode = (enum rt_ht_capability)0;

	pBssHT->rt2rt_ht_mode = (enum rt_ht_capability)0;

}



void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
@@ -734,7 +734,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, 
				 pNetwork->bssht.bd_rt2rt_aggregation;

			pHTInfo->bCurrentRT2RTLongSlotTime =

				 pNetwork->bssht.bd_rt2rt_long_slot_time;

			pHTInfo->RT2RT_HT_Mode = pNetwork->bssht.RT2RT_HT_Mode;

			pHTInfo->RT2RT_HT_Mode = pNetwork->bssht.rt2rt_ht_mode;

		} else {

			pHTInfo->bCurrentRT2RTAggregation = false;

			pHTInfo->bCurrentRT2RTLongSlotTime = false;

drivers/staging/rtl8192e/rtllib_rx.c

+2 −2
Original line number Diff line number Diff line
@@ -1908,12 +1908,12 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee, 


			if ((ht_realtek_agg_buf[4] == 1) &&

			    (ht_realtek_agg_buf[5] & RT_HT_CAP_USE_92SE))

				network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_92SE;

				network->bssht.rt2rt_ht_mode |= RT_HT_CAP_USE_92SE;

		}

	}

	if (ht_realtek_agg_len >= 5) {

		if ((ht_realtek_agg_buf[5] & RT_HT_CAP_USE_SOFTAP))

			network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_SOFTAP;

			network->bssht.rt2rt_ht_mode |= RT_HT_CAP_USE_SOFTAP;

	}



	if ((info_element->len >= 3 &&