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

staging: rtl8192e: rename TID to tid in ba_param_set union

This change uses lowercase for a field name to be more consistent with
the rest of the union.
Signed-off-by: default avatarWilliam Durand <will+git@drnd.me>
Link: https://lore.kernel.org/r/20210219101206.18036-7-will+git@drnd.meSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a6850f14
...@@ -33,7 +33,7 @@ union ba_param_set { ...@@ -33,7 +33,7 @@ union ba_param_set {
struct { struct {
u16 amsdu_support:1; u16 amsdu_support:1;
u16 ba_policy:1; u16 ba_policy:1;
u16 TID:4; u16 tid:4;
u16 buffer_size:10; u16 buffer_size:10;
} field; } field;
}; };
......
...@@ -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->BaParamSet.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)
...@@ -260,7 +260,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -260,7 +260,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
goto OnADDBAReq_Fail; goto OnADDBAReq_Fail;
} }
if (!GetTs(ieee, (struct ts_common_info **)(&pTS), dst, if (!GetTs(ieee, (struct ts_common_info **)(&pTS), dst,
(u8)(pBaParamSet->field.TID), RX_DIR, true)) { (u8)(pBaParamSet->field.tid), RX_DIR, true)) {
rc = ADDBA_STATUS_REFUSED; rc = ADDBA_STATUS_REFUSED;
netdev_warn(ieee->dev, "%s(): can't get TS\n", __func__); netdev_warn(ieee->dev, "%s(): can't get TS\n", __func__);
goto OnADDBAReq_Fail; goto OnADDBAReq_Fail;
...@@ -346,7 +346,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) ...@@ -346,7 +346,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
if (!GetTs(ieee, (struct ts_common_info **)(&pTS), dst, if (!GetTs(ieee, (struct ts_common_info **)(&pTS), dst,
(u8)(pBaParamSet->field.TID), TX_DIR, false)) { (u8)(pBaParamSet->field.tid), TX_DIR, false)) {
netdev_warn(ieee->dev, "%s(): can't get TS\n", __func__); netdev_warn(ieee->dev, "%s(): can't get TS\n", __func__);
ReasonCode = DELBA_REASON_UNKNOWN_BA; ReasonCode = DELBA_REASON_UNKNOWN_BA;
goto OnADDBARsp_Reject; goto OnADDBARsp_Reject;
...@@ -485,8 +485,7 @@ void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS, ...@@ -485,8 +485,7 @@ void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS,
pBA->DialogToken++; pBA->DialogToken++;
pBA->BaParamSet.field.amsdu_support = 0; pBA->BaParamSet.field.amsdu_support = 0;
pBA->BaParamSet.field.ba_policy = Policy; pBA->BaParamSet.field.ba_policy = Policy;
pBA->BaParamSet.field.TID = pBA->BaParamSet.field.tid = pTS->TsCommonInfo.TSpec.f.TSInfo.field.ucTSID;
pTS->TsCommonInfo.TSpec.f.TSInfo.field.ucTSID;
pBA->BaParamSet.field.buffer_size = 32; pBA->BaParamSet.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