mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-29 15:14:18 +08:00
staging: rtl8192e: Rename bSwBwInPro..., bRegRT2RTAg... and bCurrentRT...
Rename variable bSwBwInProgress to sw_bw_in_progress, bRegRT2RTAggregation to reg_rt2rt_aggregation and bCurrentRT2RTAggregation to current_rt2rt_aggregation to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> Link: https://lore.kernel.org/r/868f9db0e29bd170129f90bdbcc14238a750c440.1664055213.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
92b2f4b851
commit
27dd3f00a7
@ -151,12 +151,12 @@ struct rt_hi_throughput {
|
||||
u8 cur_tx_bw40mhz;
|
||||
u8 PeerBandwidth;
|
||||
|
||||
u8 bSwBwInProgress;
|
||||
u8 sw_bw_in_progress;
|
||||
u8 SwBwStep;
|
||||
|
||||
u8 bRegRT2RTAggregation;
|
||||
u8 reg_rt2rt_aggregation;
|
||||
u8 RT2RT_HT_Mode;
|
||||
u8 bCurrentRT2RTAggregation;
|
||||
u8 current_rt2rt_aggregation;
|
||||
u8 current_rt2rt_long_slot_time;
|
||||
u8 szRT2RTAggBuffer[10];
|
||||
|
||||
|
@ -98,7 +98,7 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee)
|
||||
|
||||
ieee->bTxEnableFwCalcDur = 1;
|
||||
|
||||
pHTInfo->bRegRT2RTAggregation = 1;
|
||||
pHTInfo->reg_rt2rt_aggregation = 1;
|
||||
|
||||
pHTInfo->bRegRxReorderEnable = 1;
|
||||
pHTInfo->RxReorderWinSize = 64;
|
||||
@ -574,7 +574,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
|
||||
pHTInfo->bCurrentAMPDUEnable = false;
|
||||
}
|
||||
|
||||
if (!pHTInfo->bRegRT2RTAggregation) {
|
||||
if (!pHTInfo->reg_rt2rt_aggregation) {
|
||||
if (pHTInfo->AMPDU_Factor > pPeerHTCap->MaxRxAMPDUFactor)
|
||||
pHTInfo->CurrentAMPDUFactor =
|
||||
pPeerHTCap->MaxRxAMPDUFactor;
|
||||
@ -655,11 +655,11 @@ void HTInitializeHTInfo(struct rtllib_device *ieee)
|
||||
memset((void *)(&(pHTInfo->PeerHTInfoBuf)), 0,
|
||||
sizeof(pHTInfo->PeerHTInfoBuf));
|
||||
|
||||
pHTInfo->bSwBwInProgress = false;
|
||||
pHTInfo->sw_bw_in_progress = false;
|
||||
|
||||
pHTInfo->ePeerHTSpecVer = HT_SPEC_VER_IEEE;
|
||||
|
||||
pHTInfo->bCurrentRT2RTAggregation = false;
|
||||
pHTInfo->current_rt2rt_aggregation = false;
|
||||
pHTInfo->current_rt2rt_long_slot_time = false;
|
||||
pHTInfo->RT2RT_HT_Mode = (enum rt_ht_capability)0;
|
||||
|
||||
@ -717,14 +717,14 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
|
||||
pNetwork->bssht.bd_ht_info_buf,
|
||||
pNetwork->bssht.bd_ht_info_len);
|
||||
|
||||
if (pHTInfo->bRegRT2RTAggregation) {
|
||||
pHTInfo->bCurrentRT2RTAggregation =
|
||||
if (pHTInfo->reg_rt2rt_aggregation) {
|
||||
pHTInfo->current_rt2rt_aggregation =
|
||||
pNetwork->bssht.bd_rt2rt_aggregation;
|
||||
pHTInfo->current_rt2rt_long_slot_time =
|
||||
pNetwork->bssht.bd_rt2rt_long_slot_time;
|
||||
pHTInfo->RT2RT_HT_Mode = pNetwork->bssht.rt2rt_ht_mode;
|
||||
} else {
|
||||
pHTInfo->bCurrentRT2RTAggregation = false;
|
||||
pHTInfo->current_rt2rt_aggregation = false;
|
||||
pHTInfo->current_rt2rt_long_slot_time = false;
|
||||
pHTInfo->RT2RT_HT_Mode = (enum rt_ht_capability)0;
|
||||
}
|
||||
@ -756,7 +756,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
|
||||
pHTInfo->IOTAction |= HT_IOT_ACT_CDD_FSYNC;
|
||||
} else {
|
||||
pHTInfo->bCurrentHTSupport = false;
|
||||
pHTInfo->bCurrentRT2RTAggregation = false;
|
||||
pHTInfo->current_rt2rt_aggregation = false;
|
||||
pHTInfo->current_rt2rt_long_slot_time = false;
|
||||
pHTInfo->RT2RT_HT_Mode = (enum rt_ht_capability)0;
|
||||
|
||||
@ -850,7 +850,7 @@ static void HTSetConnectBwModeCallback(struct rtllib_device *ieee)
|
||||
HT_EXTCHNL_OFFSET_NO_EXT);
|
||||
}
|
||||
|
||||
pHTInfo->bSwBwInProgress = false;
|
||||
pHTInfo->sw_bw_in_progress = false;
|
||||
}
|
||||
|
||||
void HTSetConnectBwMode(struct rtllib_device *ieee,
|
||||
@ -865,8 +865,8 @@ void HTSetConnectBwMode(struct rtllib_device *ieee,
|
||||
if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))
|
||||
Bandwidth = HT_CHANNEL_WIDTH_20;
|
||||
|
||||
if (pHTInfo->bSwBwInProgress) {
|
||||
pr_info("%s: bSwBwInProgress!!\n", __func__);
|
||||
if (pHTInfo->sw_bw_in_progress) {
|
||||
pr_info("%s: sw_bw_in_progress!!\n", __func__);
|
||||
return;
|
||||
}
|
||||
if (Bandwidth == HT_CHANNEL_WIDTH_20_40) {
|
||||
@ -889,7 +889,7 @@ void HTSetConnectBwMode(struct rtllib_device *ieee,
|
||||
netdev_dbg(ieee->dev, "%s():pHTInfo->bCurBW40MHz:%x\n", __func__,
|
||||
pHTInfo->bCurBW40MHz);
|
||||
|
||||
pHTInfo->bSwBwInProgress = true;
|
||||
pHTInfo->sw_bw_in_progress = true;
|
||||
|
||||
HTSetConnectBwModeCallback(ieee);
|
||||
}
|
||||
|
@ -865,7 +865,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee,
|
||||
HTConstructInfoElement(ieee, tmp_ht_info_buf, &tmp_ht_info_len,
|
||||
encrypt);
|
||||
|
||||
if (pHTInfo->bRegRT2RTAggregation) {
|
||||
if (pHTInfo->reg_rt2rt_aggregation) {
|
||||
tmp_generic_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer;
|
||||
tmp_generic_ie_len =
|
||||
sizeof(ieee->pHTInfo->szRT2RTAggBuffer);
|
||||
@ -1189,7 +1189,7 @@ rtllib_association_req(struct rtllib_network *beacon,
|
||||
ht_cap_len = sizeof(ieee->pHTInfo->SelfHTCap);
|
||||
HTConstructCapabilityElement(ieee, ht_cap_buf, &ht_cap_len,
|
||||
encrypt, true);
|
||||
if (ieee->pHTInfo->bCurrentRT2RTAggregation) {
|
||||
if (ieee->pHTInfo->current_rt2rt_aggregation) {
|
||||
realtek_ie_buf = ieee->pHTInfo->szRT2RTAggBuffer;
|
||||
realtek_ie_len =
|
||||
sizeof(ieee->pHTInfo->szRT2RTAggBuffer);
|
||||
@ -1368,7 +1368,7 @@ rtllib_association_req(struct rtllib_network *beacon,
|
||||
tag += ht_cap_len - 2;
|
||||
}
|
||||
|
||||
if (ieee->pHTInfo->bCurrentRT2RTAggregation) {
|
||||
if (ieee->pHTInfo->current_rt2rt_aggregation) {
|
||||
tag = skb_put(skb, realtek_ie_len);
|
||||
*tag++ = MFIE_TYPE_GENERIC;
|
||||
*tag++ = realtek_ie_len - 2;
|
||||
|
Loading…
Reference in New Issue
Block a user