Commit 34fea352 authored by William Durand's avatar William Durand Committed by Greg Kroah-Hartman

staging: rtl8192e: rename BaStartSeqCtrl to ba_start_seq_ctrl in ba_record struct

Fixes a checkpatch CHECK issue.
Signed-off-by: default avatarWilliam Durand <will+git@drnd.me>
Link: https://lore.kernel.org/r/20210219231128.27119-7-will+git@drnd.meSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 092bc4e7
...@@ -54,7 +54,7 @@ struct ba_record { ...@@ -54,7 +54,7 @@ struct ba_record {
u8 dialog_token; u8 dialog_token;
union ba_param_set ba_param_set; union ba_param_set ba_param_set;
u16 ba_timeout_value; u16 ba_timeout_value;
union sequence_control BaStartSeqCtrl; union sequence_control ba_start_seq_ctrl;
}; };
#endif #endif
...@@ -57,11 +57,11 @@ static u8 RxTsDeleteBA(struct rtllib_device *ieee, struct rx_ts_record *pRxTs) ...@@ -57,11 +57,11 @@ static u8 RxTsDeleteBA(struct rtllib_device *ieee, struct rx_ts_record *pRxTs)
void ResetBaEntry(struct ba_record *pBA) void ResetBaEntry(struct ba_record *pBA)
{ {
pBA->b_valid = false; pBA->b_valid = false;
pBA->ba_param_set.short_data = 0; pBA->ba_param_set.short_data = 0;
pBA->ba_timeout_value = 0; pBA->ba_timeout_value = 0;
pBA->dialog_token = 0; pBA->dialog_token = 0;
pBA->BaStartSeqCtrl.short_data = 0; pBA->ba_start_seq_ctrl.short_data = 0;
} }
static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst,
struct ba_record *pBA, struct ba_record *pBA,
...@@ -114,7 +114,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, ...@@ -114,7 +114,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst,
tag += 2; tag += 2;
if (type == ACT_ADDBAREQ) { if (type == ACT_ADDBAREQ) {
memcpy(tag, (u8 *)&(pBA->BaStartSeqCtrl), 2); memcpy(tag, (u8 *)&(pBA->ba_start_seq_ctrl), 2);
tag += 2; tag += 2;
} }
...@@ -280,7 +280,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -280,7 +280,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
pBA->dialog_token = *pDialogToken; pBA->dialog_token = *pDialogToken;
pBA->ba_param_set = *pBaParamSet; pBA->ba_param_set = *pBaParamSet;
pBA->ba_timeout_value = *pBaTimeoutVal; pBA->ba_timeout_value = *pBaTimeoutVal;
pBA->BaStartSeqCtrl = *pBaStartSeqCtrl; pBA->ba_start_seq_ctrl = *pBaStartSeqCtrl;
if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev) || if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev) ||
(ieee->pHTInfo->IOTAction & HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT)) (ieee->pHTInfo->IOTAction & HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT))
...@@ -387,7 +387,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -387,7 +387,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
pAdmittedBA->dialog_token = *pDialogToken; pAdmittedBA->dialog_token = *pDialogToken;
pAdmittedBA->ba_timeout_value = *pBaTimeoutVal; pAdmittedBA->ba_timeout_value = *pBaTimeoutVal;
pAdmittedBA->BaStartSeqCtrl = pPendingBA->BaStartSeqCtrl; pAdmittedBA->ba_start_seq_ctrl = pPendingBA->ba_start_seq_ctrl;
pAdmittedBA->ba_param_set = *pBaParamSet; pAdmittedBA->ba_param_set = *pBaParamSet;
DeActivateBAEntry(ieee, pAdmittedBA); DeActivateBAEntry(ieee, pAdmittedBA);
ActivateBAEntry(ieee, pAdmittedBA, *pBaTimeoutVal); ActivateBAEntry(ieee, pAdmittedBA, *pBaTimeoutVal);
...@@ -488,7 +488,7 @@ void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS, ...@@ -488,7 +488,7 @@ void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS,
pBA->ba_param_set.field.tid = pTS->TsCommonInfo.TSpec.f.TSInfo.field.ucTSID; pBA->ba_param_set.field.tid = pTS->TsCommonInfo.TSpec.f.TSInfo.field.ucTSID;
pBA->ba_param_set.field.buffer_size = 32; pBA->ba_param_set.field.buffer_size = 32;
pBA->ba_timeout_value = 0; pBA->ba_timeout_value = 0;
pBA->BaStartSeqCtrl.field.seq_num = (pTS->TxCurSeq + 3) % 4096; pBA->ba_start_seq_ctrl.field.seq_num = (pTS->TxCurSeq + 3) % 4096;
ActivateBAEntry(ieee, pBA, BA_SETUP_TIMEOUT); ActivateBAEntry(ieee, pBA, BA_SETUP_TIMEOUT);
......
...@@ -308,7 +308,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee, ...@@ -308,7 +308,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
} }
goto FORCED_AGG_SETTING; goto FORCED_AGG_SETTING;
} else if (!pTxTs->bUsingBa) { } else if (!pTxTs->bUsingBa) {
if (SN_LESS(pTxTs->TxAdmittedBARecord.BaStartSeqCtrl.field.seq_num, if (SN_LESS(pTxTs->TxAdmittedBARecord.ba_start_seq_ctrl.field.seq_num,
(pTxTs->TxCurSeq+1)%4096)) (pTxTs->TxCurSeq+1)%4096))
pTxTs->bUsingBa = true; pTxTs->bUsingBa = true;
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment