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

staging: rtl8192e: rename BaParamSet to ba_param_set 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-5-will+git@drnd.meSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 142867ea
...@@ -52,7 +52,7 @@ struct ba_record { ...@@ -52,7 +52,7 @@ struct ba_record {
struct timer_list timer; struct timer_list timer;
u8 b_valid; u8 b_valid;
u8 dialog_token; u8 dialog_token;
union ba_param_set BaParamSet; union ba_param_set ba_param_set;
u16 BaTimeoutValue; u16 BaTimeoutValue;
union sequence_control BaStartSeqCtrl; union sequence_control BaStartSeqCtrl;
}; };
......
...@@ -58,7 +58,7 @@ static u8 RxTsDeleteBA(struct rtllib_device *ieee, struct rx_ts_record *pRxTs) ...@@ -58,7 +58,7 @@ 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->BaParamSet.short_data = 0; pBA->ba_param_set.short_data = 0;
pBA->BaTimeoutValue = 0; pBA->BaTimeoutValue = 0;
pBA->dialog_token = 0; pBA->dialog_token = 0;
pBA->BaStartSeqCtrl.short_data = 0; pBA->BaStartSeqCtrl.short_data = 0;
...@@ -107,7 +107,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, ...@@ -107,7 +107,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst,
tag += 2; tag += 2;
} }
put_unaligned_le16(pBA->BaParamSet.short_data, tag); put_unaligned_le16(pBA->ba_param_set.short_data, tag);
tag += 2; tag += 2;
put_unaligned_le16(pBA->BaTimeoutValue, tag); put_unaligned_le16(pBA->BaTimeoutValue, tag);
...@@ -142,7 +142,7 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst, ...@@ -142,7 +142,7 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst,
memset(&DelbaParamSet, 0, 2); memset(&DelbaParamSet, 0, 2);
DelbaParamSet.field.initiator = (TxRxSelect == TX_DIR) ? 1 : 0; DelbaParamSet.field.initiator = (TxRxSelect == TX_DIR) ? 1 : 0;
DelbaParamSet.field.tid = pBA->BaParamSet.field.tid; DelbaParamSet.field.tid = pBA->ba_param_set.field.tid;
skb = dev_alloc_skb(len + sizeof(struct rtllib_hdr_3addr)); skb = dev_alloc_skb(len + sizeof(struct rtllib_hdr_3addr));
if (!skb) if (!skb)
...@@ -278,15 +278,15 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -278,15 +278,15 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
DeActivateBAEntry(ieee, pBA); DeActivateBAEntry(ieee, pBA);
pBA->dialog_token = *pDialogToken; pBA->dialog_token = *pDialogToken;
pBA->BaParamSet = *pBaParamSet; pBA->ba_param_set = *pBaParamSet;
pBA->BaTimeoutValue = *pBaTimeoutVal; pBA->BaTimeoutValue = *pBaTimeoutVal;
pBA->BaStartSeqCtrl = *pBaStartSeqCtrl; pBA->BaStartSeqCtrl = *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))
pBA->BaParamSet.field.buffer_size = 1; pBA->ba_param_set.field.buffer_size = 1;
else else
pBA->BaParamSet.field.buffer_size = 32; pBA->ba_param_set.field.buffer_size = 32;
ActivateBAEntry(ieee, pBA, 0); ActivateBAEntry(ieee, pBA, 0);
rtllib_send_ADDBARsp(ieee, dst, pBA, ADDBA_STATUS_SUCCESS); rtllib_send_ADDBARsp(ieee, dst, pBA, ADDBA_STATUS_SUCCESS);
...@@ -297,10 +297,10 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -297,10 +297,10 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
{ {
struct ba_record BA; struct ba_record BA;
BA.BaParamSet = *pBaParamSet; BA.ba_param_set = *pBaParamSet;
BA.BaTimeoutValue = *pBaTimeoutVal; BA.BaTimeoutValue = *pBaTimeoutVal;
BA.dialog_token = *pDialogToken; BA.dialog_token = *pDialogToken;
BA.BaParamSet.field.ba_policy = BA_POLICY_IMMEDIATE; BA.ba_param_set.field.ba_policy = BA_POLICY_IMMEDIATE;
rtllib_send_ADDBARsp(ieee, dst, &BA, rc); rtllib_send_ADDBARsp(ieee, dst, &BA, rc);
return 0; return 0;
} }
...@@ -388,7 +388,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -388,7 +388,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
pAdmittedBA->dialog_token = *pDialogToken; pAdmittedBA->dialog_token = *pDialogToken;
pAdmittedBA->BaTimeoutValue = *pBaTimeoutVal; pAdmittedBA->BaTimeoutValue = *pBaTimeoutVal;
pAdmittedBA->BaStartSeqCtrl = pPendingBA->BaStartSeqCtrl; pAdmittedBA->BaStartSeqCtrl = pPendingBA->BaStartSeqCtrl;
pAdmittedBA->BaParamSet = *pBaParamSet; pAdmittedBA->ba_param_set = *pBaParamSet;
DeActivateBAEntry(ieee, pAdmittedBA); DeActivateBAEntry(ieee, pAdmittedBA);
ActivateBAEntry(ieee, pAdmittedBA, *pBaTimeoutVal); ActivateBAEntry(ieee, pAdmittedBA, *pBaTimeoutVal);
} else { } else {
...@@ -404,7 +404,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -404,7 +404,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
{ {
struct ba_record BA; struct ba_record BA;
BA.BaParamSet = *pBaParamSet; BA.ba_param_set = *pBaParamSet;
rtllib_send_DELBA(ieee, dst, &BA, TX_DIR, ReasonCode); rtllib_send_DELBA(ieee, dst, &BA, TX_DIR, ReasonCode);
return 0; return 0;
} }
...@@ -483,10 +483,10 @@ void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS, ...@@ -483,10 +483,10 @@ void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS,
DeActivateBAEntry(ieee, pBA); DeActivateBAEntry(ieee, pBA);
pBA->dialog_token++; pBA->dialog_token++;
pBA->BaParamSet.field.amsdu_support = 0; pBA->ba_param_set.field.amsdu_support = 0;
pBA->BaParamSet.field.ba_policy = Policy; pBA->ba_param_set.field.ba_policy = Policy;
pBA->BaParamSet.field.tid = pTS->TsCommonInfo.TSpec.f.TSInfo.field.ucTSID; pBA->ba_param_set.field.tid = pTS->TsCommonInfo.TSpec.f.TSInfo.field.ucTSID;
pBA->BaParamSet.field.buffer_size = 32; pBA->ba_param_set.field.buffer_size = 32;
pBA->BaTimeoutValue = 0; pBA->BaTimeoutValue = 0;
pBA->BaStartSeqCtrl.field.seq_num = (pTS->TxCurSeq + 3) % 4096; pBA->BaStartSeqCtrl.field.seq_num = (pTS->TxCurSeq + 3) % 4096;
......
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