mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
Staging: rtl8192e: Rename variable pTS
Rename variable pTS to ts to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies <tdavies@darkphysics.net> Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> Link: https://lore.kernel.org/r/20231014044435.11947-5-tdavies@darkphysics.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
3a22549f1a
commit
cf65511eee
4 changed files with 65 additions and 65 deletions
|
@ -304,7 +304,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
struct ieee80211_hdr_3addr *rsp = NULL;
|
struct ieee80211_hdr_3addr *rsp = NULL;
|
||||||
struct ba_record *pending_ba, *pAdmittedBA;
|
struct ba_record *pending_ba, *pAdmittedBA;
|
||||||
struct tx_ts_record *pTS = NULL;
|
struct tx_ts_record *ts = NULL;
|
||||||
u8 *dst = NULL, *pDialogToken = NULL, *tag = NULL;
|
u8 *dst = NULL, *pDialogToken = NULL, *tag = NULL;
|
||||||
u16 *status_code = NULL, *pBaTimeoutVal = NULL;
|
u16 *status_code = NULL, *pBaTimeoutVal = NULL;
|
||||||
union ba_param_set *pBaParamSet = NULL;
|
union ba_param_set *pBaParamSet = NULL;
|
||||||
|
@ -337,16 +337,16 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
|
||||||
goto OnADDBARsp_Reject;
|
goto OnADDBARsp_Reject;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!rtllib_get_ts(ieee, (struct ts_common_info **)&pTS, dst,
|
if (!rtllib_get_ts(ieee, (struct ts_common_info **)&ts, 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__);
|
||||||
reason_code = DELBA_REASON_UNKNOWN_BA;
|
reason_code = DELBA_REASON_UNKNOWN_BA;
|
||||||
goto OnADDBARsp_Reject;
|
goto OnADDBARsp_Reject;
|
||||||
}
|
}
|
||||||
|
|
||||||
pTS->bAddBaReqInProgress = false;
|
ts->bAddBaReqInProgress = false;
|
||||||
pending_ba = &pTS->TxPendingBARecord;
|
pending_ba = &ts->TxPendingBARecord;
|
||||||
pAdmittedBA = &pTS->TxAdmittedBARecord;
|
pAdmittedBA = &ts->TxAdmittedBARecord;
|
||||||
|
|
||||||
if (pAdmittedBA->b_valid) {
|
if (pAdmittedBA->b_valid) {
|
||||||
netdev_dbg(ieee->dev, "%s(): ADDBA response already admitted\n",
|
netdev_dbg(ieee->dev, "%s(): ADDBA response already admitted\n",
|
||||||
|
@ -368,7 +368,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
|
||||||
|
|
||||||
if (*status_code == ADDBA_STATUS_SUCCESS) {
|
if (*status_code == ADDBA_STATUS_SUCCESS) {
|
||||||
if (pBaParamSet->field.ba_policy == BA_POLICY_DELAYED) {
|
if (pBaParamSet->field.ba_policy == BA_POLICY_DELAYED) {
|
||||||
pTS->bAddBaReqDelayed = true;
|
ts->bAddBaReqDelayed = true;
|
||||||
deactivate_ba_entry(ieee, pAdmittedBA);
|
deactivate_ba_entry(ieee, pAdmittedBA);
|
||||||
reason_code = DELBA_REASON_END_BA;
|
reason_code = DELBA_REASON_END_BA;
|
||||||
goto OnADDBARsp_Reject;
|
goto OnADDBARsp_Reject;
|
||||||
|
@ -381,8 +381,8 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
|
||||||
deactivate_ba_entry(ieee, pAdmittedBA);
|
deactivate_ba_entry(ieee, pAdmittedBA);
|
||||||
activate_ba_entry(pAdmittedBA, *pBaTimeoutVal);
|
activate_ba_entry(pAdmittedBA, *pBaTimeoutVal);
|
||||||
} else {
|
} else {
|
||||||
pTS->bAddBaReqDelayed = true;
|
ts->bAddBaReqDelayed = true;
|
||||||
pTS->bDisable_AddBa = true;
|
ts->bDisable_AddBa = true;
|
||||||
reason_code = DELBA_REASON_END_BA;
|
reason_code = DELBA_REASON_END_BA;
|
||||||
goto OnADDBARsp_Reject;
|
goto OnADDBARsp_Reject;
|
||||||
}
|
}
|
||||||
|
@ -461,10 +461,10 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS,
|
void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *ts,
|
||||||
u8 policy, u8 bOverwritePending)
|
u8 policy, u8 bOverwritePending)
|
||||||
{
|
{
|
||||||
struct ba_record *ba = &pTS->TxPendingBARecord;
|
struct ba_record *ba = &ts->TxPendingBARecord;
|
||||||
|
|
||||||
if (ba->b_valid && !bOverwritePending)
|
if (ba->b_valid && !bOverwritePending)
|
||||||
return;
|
return;
|
||||||
|
@ -474,14 +474,14 @@ void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS,
|
||||||
ba->dialog_token++;
|
ba->dialog_token++;
|
||||||
ba->ba_param_set.field.amsdu_support = 0;
|
ba->ba_param_set.field.amsdu_support = 0;
|
||||||
ba->ba_param_set.field.ba_policy = policy;
|
ba->ba_param_set.field.ba_policy = policy;
|
||||||
ba->ba_param_set.field.tid = pTS->TsCommonInfo.TSpec.f.ts_info.field.ucTSID;
|
ba->ba_param_set.field.tid = ts->TsCommonInfo.TSpec.f.ts_info.field.ucTSID;
|
||||||
ba->ba_param_set.field.buffer_size = 32;
|
ba->ba_param_set.field.buffer_size = 32;
|
||||||
ba->ba_timeout_value = 0;
|
ba->ba_timeout_value = 0;
|
||||||
ba->ba_start_seq_ctrl.field.seq_num = (pTS->TxCurSeq + 3) % 4096;
|
ba->ba_start_seq_ctrl.field.seq_num = (ts->TxCurSeq + 3) % 4096;
|
||||||
|
|
||||||
activate_ba_entry(ba, BA_SETUP_TIMEOUT);
|
activate_ba_entry(ba, BA_SETUP_TIMEOUT);
|
||||||
|
|
||||||
rtllib_send_ADDBAReq(ieee, pTS->TsCommonInfo.addr, ba);
|
rtllib_send_ADDBAReq(ieee, ts->TsCommonInfo.addr, ba);
|
||||||
}
|
}
|
||||||
|
|
||||||
void rtllib_ts_init_del_ba(struct rtllib_device *ieee,
|
void rtllib_ts_init_del_ba(struct rtllib_device *ieee,
|
||||||
|
|
|
@ -100,16 +100,16 @@ static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)
|
||||||
pTsCommonInfo->TClasNum = 0;
|
pTsCommonInfo->TClasNum = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ResetTxTsEntry(struct tx_ts_record *pTS)
|
static void ResetTxTsEntry(struct tx_ts_record *ts)
|
||||||
{
|
{
|
||||||
ResetTsCommonInfo(&pTS->TsCommonInfo);
|
ResetTsCommonInfo(&ts->TsCommonInfo);
|
||||||
pTS->TxCurSeq = 0;
|
ts->TxCurSeq = 0;
|
||||||
pTS->bAddBaReqInProgress = false;
|
ts->bAddBaReqInProgress = false;
|
||||||
pTS->bAddBaReqDelayed = false;
|
ts->bAddBaReqDelayed = false;
|
||||||
pTS->bUsingBa = false;
|
ts->bUsingBa = false;
|
||||||
pTS->bDisable_AddBa = false;
|
ts->bDisable_AddBa = false;
|
||||||
rtllib_reset_ba_entry(&pTS->TxAdmittedBARecord);
|
rtllib_reset_ba_entry(&ts->TxAdmittedBARecord);
|
||||||
rtllib_reset_ba_entry(&pTS->TxPendingBARecord);
|
rtllib_reset_ba_entry(&ts->TxPendingBARecord);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ResetRxTsEntry(struct rx_ts_record *ts)
|
static void ResetRxTsEntry(struct rx_ts_record *ts)
|
||||||
|
@ -382,41 +382,41 @@ static void RemoveTsEntry(struct rtllib_device *ieee,
|
||||||
|
|
||||||
void RemovePeerTS(struct rtllib_device *ieee, u8 *addr)
|
void RemovePeerTS(struct rtllib_device *ieee, u8 *addr)
|
||||||
{
|
{
|
||||||
struct ts_common_info *pTS, *pTmpTS;
|
struct ts_common_info *ts, *pTmpTS;
|
||||||
|
|
||||||
netdev_info(ieee->dev, "===========>%s, %pM\n", __func__, addr);
|
netdev_info(ieee->dev, "===========>%s, %pM\n", __func__, addr);
|
||||||
|
|
||||||
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) {
|
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, List) {
|
||||||
if (memcmp(pTS->addr, addr, 6) == 0) {
|
if (memcmp(ts->addr, addr, 6) == 0) {
|
||||||
RemoveTsEntry(ieee, pTS, TX_DIR);
|
RemoveTsEntry(ieee, ts, TX_DIR);
|
||||||
list_del_init(&pTS->List);
|
list_del_init(&ts->List);
|
||||||
list_add_tail(&pTS->List, &ieee->Tx_TS_Unused_List);
|
list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Admit_List, List) {
|
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, List) {
|
||||||
if (memcmp(pTS->addr, addr, 6) == 0) {
|
if (memcmp(ts->addr, addr, 6) == 0) {
|
||||||
netdev_info(ieee->dev,
|
netdev_info(ieee->dev,
|
||||||
"====>remove Tx_TS_admin_list\n");
|
"====>remove Tx_TS_admin_list\n");
|
||||||
RemoveTsEntry(ieee, pTS, TX_DIR);
|
RemoveTsEntry(ieee, ts, TX_DIR);
|
||||||
list_del_init(&pTS->List);
|
list_del_init(&ts->List);
|
||||||
list_add_tail(&pTS->List, &ieee->Tx_TS_Unused_List);
|
list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Pending_List, List) {
|
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, List) {
|
||||||
if (memcmp(pTS->addr, addr, 6) == 0) {
|
if (memcmp(ts->addr, addr, 6) == 0) {
|
||||||
RemoveTsEntry(ieee, pTS, RX_DIR);
|
RemoveTsEntry(ieee, ts, RX_DIR);
|
||||||
list_del_init(&pTS->List);
|
list_del_init(&ts->List);
|
||||||
list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List);
|
list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Admit_List, List) {
|
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, List) {
|
||||||
if (memcmp(pTS->addr, addr, 6) == 0) {
|
if (memcmp(ts->addr, addr, 6) == 0) {
|
||||||
RemoveTsEntry(ieee, pTS, RX_DIR);
|
RemoveTsEntry(ieee, ts, RX_DIR);
|
||||||
list_del_init(&pTS->List);
|
list_del_init(&ts->List);
|
||||||
list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List);
|
list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -424,30 +424,30 @@ EXPORT_SYMBOL(RemovePeerTS);
|
||||||
|
|
||||||
void RemoveAllTS(struct rtllib_device *ieee)
|
void RemoveAllTS(struct rtllib_device *ieee)
|
||||||
{
|
{
|
||||||
struct ts_common_info *pTS, *pTmpTS;
|
struct ts_common_info *ts, *pTmpTS;
|
||||||
|
|
||||||
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) {
|
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, List) {
|
||||||
RemoveTsEntry(ieee, pTS, TX_DIR);
|
RemoveTsEntry(ieee, ts, TX_DIR);
|
||||||
list_del_init(&pTS->List);
|
list_del_init(&ts->List);
|
||||||
list_add_tail(&pTS->List, &ieee->Tx_TS_Unused_List);
|
list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List);
|
||||||
}
|
}
|
||||||
|
|
||||||
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Admit_List, List) {
|
list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, List) {
|
||||||
RemoveTsEntry(ieee, pTS, TX_DIR);
|
RemoveTsEntry(ieee, ts, TX_DIR);
|
||||||
list_del_init(&pTS->List);
|
list_del_init(&ts->List);
|
||||||
list_add_tail(&pTS->List, &ieee->Tx_TS_Unused_List);
|
list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List);
|
||||||
}
|
}
|
||||||
|
|
||||||
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Pending_List, List) {
|
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, List) {
|
||||||
RemoveTsEntry(ieee, pTS, RX_DIR);
|
RemoveTsEntry(ieee, ts, RX_DIR);
|
||||||
list_del_init(&pTS->List);
|
list_del_init(&ts->List);
|
||||||
list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List);
|
list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List);
|
||||||
}
|
}
|
||||||
|
|
||||||
list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Admit_List, List) {
|
list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, List) {
|
||||||
RemoveTsEntry(ieee, pTS, RX_DIR);
|
RemoveTsEntry(ieee, ts, RX_DIR);
|
||||||
list_del_init(&pTS->List);
|
list_del_init(&ts->List);
|
||||||
list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List);
|
list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1788,7 +1788,7 @@ u16 TxCountToDataRate(struct rtllib_device *ieee, u8 nDataRate);
|
||||||
int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb);
|
int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb);
|
||||||
int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb);
|
int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb);
|
||||||
int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb);
|
int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb);
|
||||||
void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS,
|
void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *ts,
|
||||||
u8 policy, u8 bOverwritePending);
|
u8 policy, u8 bOverwritePending);
|
||||||
void rtllib_ts_init_del_ba(struct rtllib_device *ieee,
|
void rtllib_ts_init_del_ba(struct rtllib_device *ieee,
|
||||||
struct ts_common_info *pTsCommonInfo,
|
struct ts_common_info *pTsCommonInfo,
|
||||||
|
|
|
@ -495,13 +495,13 @@ static u16 rtllib_query_seqnum(struct rtllib_device *ieee, struct sk_buff *skb,
|
||||||
if (is_multicast_ether_addr(dst))
|
if (is_multicast_ether_addr(dst))
|
||||||
return 0;
|
return 0;
|
||||||
if (IsQoSDataFrame(skb->data)) {
|
if (IsQoSDataFrame(skb->data)) {
|
||||||
struct tx_ts_record *pTS = NULL;
|
struct tx_ts_record *ts = NULL;
|
||||||
|
|
||||||
if (!rtllib_get_ts(ieee, (struct ts_common_info **)(&pTS), dst,
|
if (!rtllib_get_ts(ieee, (struct ts_common_info **)(&ts), dst,
|
||||||
skb->priority, TX_DIR, true))
|
skb->priority, TX_DIR, true))
|
||||||
return 0;
|
return 0;
|
||||||
seqnum = pTS->TxCurSeq;
|
seqnum = ts->TxCurSeq;
|
||||||
pTS->TxCurSeq = (pTS->TxCurSeq + 1) % 4096;
|
ts->TxCurSeq = (ts->TxCurSeq + 1) % 4096;
|
||||||
return seqnum;
|
return seqnum;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue