Skip to content

Commit 8e23184

Browse files
treedaviesgregkh
treedavies
authored and
gregkh
committed
Staging: rtl8192e: Rename variable TxRxSelect
Rename variable TxRxSelect to tx_rx_select 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/20240229024325.453374-3-tdavies@darkphysics.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 11f1861 commit 8e23184

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎drivers/staging/rtl8192e/rtl819x_BAProc.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *dst,
125125

126126
static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst,
127127
struct ba_record *ba,
128-
enum tr_select TxRxSelect, u16 reason_code)
128+
enum tr_select tx_rx_select, u16 reason_code)
129129
{
130130
union delba_param_set del_ba_param_set;
131131
struct sk_buff *skb = NULL;
@@ -139,7 +139,7 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst,
139139

140140
memset(&del_ba_param_set, 0, 2);
141141

142-
del_ba_param_set.field.initiator = (TxRxSelect == TX_DIR) ? 1 : 0;
142+
del_ba_param_set.field.initiator = (tx_rx_select == TX_DIR) ? 1 : 0;
143143
del_ba_param_set.field.tid = ba->ba_param_set.field.tid;
144144

145145
skb = dev_alloc_skb(len + sizeof(struct ieee80211_hdr_3addr));
@@ -199,12 +199,12 @@ static void rtllib_send_ADDBARsp(struct rtllib_device *ieee, u8 *dst,
199199
}
200200

201201
static void rtllib_send_DELBA(struct rtllib_device *ieee, u8 *dst,
202-
struct ba_record *ba, enum tr_select TxRxSelect,
202+
struct ba_record *ba, enum tr_select tx_rx_select,
203203
u16 reason_code)
204204
{
205205
struct sk_buff *skb;
206206

207-
skb = rtllib_DELBA(ieee, dst, ba, TxRxSelect, reason_code);
207+
skb = rtllib_DELBA(ieee, dst, ba, tx_rx_select, reason_code);
208208
if (skb)
209209
softmac_mgmt_xmit(skb, ieee);
210210
else
@@ -486,9 +486,9 @@ void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *ts,
486486

487487
void rtllib_ts_init_del_ba(struct rtllib_device *ieee,
488488
struct ts_common_info *ts_common_info,
489-
enum tr_select TxRxSelect)
489+
enum tr_select tx_rx_select)
490490
{
491-
if (TxRxSelect == TX_DIR) {
491+
if (tx_rx_select == TX_DIR) {
492492
struct tx_ts_record *ts =
493493
(struct tx_ts_record *)ts_common_info;
494494

@@ -497,14 +497,14 @@ void rtllib_ts_init_del_ba(struct rtllib_device *ieee,
497497
(ts->tx_admitted_ba_record.b_valid) ?
498498
(&ts->tx_admitted_ba_record) :
499499
(&ts->tx_pending_ba_record),
500-
TxRxSelect, DELBA_REASON_END_BA);
501-
} else if (TxRxSelect == RX_DIR) {
500+
tx_rx_select, DELBA_REASON_END_BA);
501+
} else if (tx_rx_select == RX_DIR) {
502502
struct rx_ts_record *ts =
503503
(struct rx_ts_record *)ts_common_info;
504504
if (rx_ts_delete_ba(ieee, ts))
505505
rtllib_send_DELBA(ieee, ts_common_info->addr,
506506
&ts->rx_admitted_ba_record,
507-
TxRxSelect, DELBA_REASON_END_BA);
507+
tx_rx_select, DELBA_REASON_END_BA);
508508
}
509509
}
510510

‎drivers/staging/rtl8192e/rtl819x_TSProc.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,14 @@ void rtllib_ts_init(struct rtllib_device *ieee)
171171

172172
static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee,
173173
u8 *addr, u8 TID,
174-
enum tr_select TxRxSelect)
174+
enum tr_select tx_rx_select)
175175
{
176176
u8 dir;
177177
bool search_dir[4] = {0};
178178
struct list_head *psearch_list;
179179
struct ts_common_info *pRet = NULL;
180180

181-
if (TxRxSelect == TX_DIR) {
181+
if (tx_rx_select == TX_DIR) {
182182
search_dir[DIR_UP] = true;
183183
search_dir[DIR_BI_DIR] = true;
184184
search_dir[DIR_DIRECT] = true;
@@ -188,7 +188,7 @@ static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee,
188188
search_dir[DIR_DIRECT] = true;
189189
}
190190

191-
if (TxRxSelect == TX_DIR)
191+
if (tx_rx_select == TX_DIR)
192192
psearch_list = &ieee->Tx_TS_Admit_List;
193193
else
194194
psearch_list = &ieee->Rx_TS_Admit_List;
@@ -225,7 +225,7 @@ static void MakeTSEntry(struct ts_common_info *ts_common_info, u8 *addr,
225225
}
226226

227227
bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS,
228-
u8 *addr, u8 TID, enum tr_select TxRxSelect, bool bAddNewTs)
228+
u8 *addr, u8 TID, enum tr_select tx_rx_select, bool bAddNewTs)
229229
{
230230
u8 UP = 0;
231231
struct qos_tsinfo tspec;
@@ -265,7 +265,7 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS,
265265
}
266266
}
267267

268-
*ppTS = SearchAdmitTRStream(ieee, addr, UP, TxRxSelect);
268+
*ppTS = SearchAdmitTRStream(ieee, addr, UP, tx_rx_select);
269269
if (*ppTS)
270270
return true;
271271

@@ -274,21 +274,21 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS,
274274
return false;
275275
}
276276

277-
pUnusedList = (TxRxSelect == TX_DIR) ?
277+
pUnusedList = (tx_rx_select == TX_DIR) ?
278278
(&ieee->Tx_TS_Unused_List) :
279279
(&ieee->Rx_TS_Unused_List);
280280

281-
pAddmitList = (TxRxSelect == TX_DIR) ?
281+
pAddmitList = (tx_rx_select == TX_DIR) ?
282282
(&ieee->Tx_TS_Admit_List) :
283283
(&ieee->Rx_TS_Admit_List);
284284

285-
Dir = ((TxRxSelect == TX_DIR) ? DIR_UP : DIR_DOWN);
285+
Dir = ((tx_rx_select == TX_DIR) ? DIR_UP : DIR_DOWN);
286286

287287
if (!list_empty(pUnusedList)) {
288288
(*ppTS) = list_entry(pUnusedList->next,
289289
struct ts_common_info, list);
290290
list_del_init(&(*ppTS)->list);
291-
if (TxRxSelect == TX_DIR) {
291+
if (tx_rx_select == TX_DIR) {
292292
struct tx_ts_record *tmp =
293293
container_of(*ppTS,
294294
struct tx_ts_record,
@@ -321,11 +321,11 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS,
321321
}
322322

323323
static void RemoveTsEntry(struct rtllib_device *ieee,
324-
struct ts_common_info *pTs, enum tr_select TxRxSelect)
324+
struct ts_common_info *pTs, enum tr_select tx_rx_select)
325325
{
326-
rtllib_ts_init_del_ba(ieee, pTs, TxRxSelect);
326+
rtllib_ts_init_del_ba(ieee, pTs, tx_rx_select);
327327

328-
if (TxRxSelect == RX_DIR) {
328+
if (tx_rx_select == RX_DIR) {
329329
struct rx_reorder_entry *pRxReorderEntry;
330330
struct rx_ts_record *ts = (struct rx_ts_record *)pTs;
331331

‎drivers/staging/rtl8192e/rtllib.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1762,13 +1762,13 @@ void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *ts,
17621762
u8 policy, u8 overwrite_pending);
17631763
void rtllib_ts_init_del_ba(struct rtllib_device *ieee,
17641764
struct ts_common_info *ts_common_info,
1765-
enum tr_select TxRxSelect);
1765+
enum tr_select tx_rx_select);
17661766
void rtllib_ba_setup_timeout(struct timer_list *t);
17671767
void rtllib_tx_ba_inact_timeout(struct timer_list *t);
17681768
void rtllib_rx_ba_inact_timeout(struct timer_list *t);
17691769
void rtllib_reset_ba_entry(struct ba_record *ba);
17701770
bool rtllib_get_ts(struct rtllib_device *ieee, struct ts_common_info **ppTS, u8 *addr,
1771-
u8 TID, enum tr_select TxRxSelect, bool bAddNewTs);
1771+
u8 TID, enum tr_select tx_rx_select, bool bAddNewTs);
17721772
void rtllib_ts_init(struct rtllib_device *ieee);
17731773
void TsStartAddBaProcess(struct rtllib_device *ieee,
17741774
struct tx_ts_record *pTxTS);

0 commit comments

Comments
 (0)