Skip to content

Commit b5c0857

Browse files
treedaviesgregkh
authored andcommitted
Staging: rtl8192e: Rename variable ChlWidth
Rename variable ChlWidth to chl_width 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/20240428230106.6548-6-tdavies@darkphysics.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent fb3ac10 commit b5c0857

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

drivers/staging/rtl8192e/rtl819x_HT.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ enum ht_extchnl_offset {
2525

2626
struct ht_capab_ele {
2727
u8 AdvCoding:1;
28-
u8 ChlWidth:1;
28+
u8 chl_width:1;
2929
u8 MimoPwrSave:2;
3030
u8 GreenField:1;
3131
u8 ShortGI20Mhz:1;

drivers/staging/rtl8192e/rtl819x_HTProc.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,9 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
253253

254254
cap_ele->AdvCoding = 0;
255255
if (ieee->get_half_nmode_support_by_aps_handler(ieee->dev))
256-
cap_ele->ChlWidth = 0;
256+
cap_ele->chl_width = 0;
257257
else
258-
cap_ele->ChlWidth = 1;
258+
cap_ele->chl_width = 1;
259259

260260
cap_ele->MimoPwrSave = 3;
261261
cap_ele->GreenField = 0;
@@ -272,7 +272,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
272272

273273
netdev_dbg(ieee->dev,
274274
"TX HT cap/info ele BW=%d MaxAMSDUSize:%d DssCCk:%d\n",
275-
cap_ele->ChlWidth, cap_ele->MaxAMSDUSize, cap_ele->DssCCk);
275+
cap_ele->chl_width, cap_ele->MaxAMSDUSize, cap_ele->DssCCk);
276276

277277
if (is_encrypt) {
278278
cap_ele->MPDUDensity = 7;
@@ -302,7 +302,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
302302
cap_ele->ShortGI40Mhz = 0;
303303

304304
if (ieee->get_half_nmode_support_by_aps_handler(ieee->dev)) {
305-
cap_ele->ChlWidth = 0;
305+
cap_ele->chl_width = 0;
306306
cap_ele->MCS[1] = 0;
307307
}
308308
}
@@ -452,7 +452,7 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee)
452452
print_hex_dump_bytes("%s: ", __func__, DUMP_PREFIX_NONE,
453453
pPeerHTCap, sizeof(struct ht_capab_ele));
454454
#endif
455-
ht_set_connect_bw_mode(ieee, (enum ht_channel_width)(pPeerHTCap->ChlWidth),
455+
ht_set_connect_bw_mode(ieee, (enum ht_channel_width)(pPeerHTCap->chl_width),
456456
(enum ht_extchnl_offset)(pPeerHTInfo->ExtChlOffset));
457457
ht_info->cur_tx_bw40mhz = ((pPeerHTInfo->RecommemdedTxWidth == 1) ?
458458
true : false);

drivers/staging/rtl8192e/rtllib_rx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1877,7 +1877,7 @@ static void rtllib_parse_mfie_ht_cap(struct rtllib_info_element *info_element,
18771877

18781878
ht->bd_bandwidth = (enum ht_channel_width)
18791879
(((struct ht_capab_ele *)
1880-
(ht->bd_ht_cap_buf))->ChlWidth);
1880+
(ht->bd_ht_cap_buf))->chl_width);
18811881
} else {
18821882
ht->bd_support_ht = false;
18831883
ht->bd_ht_1r = false;

drivers/staging/rtl8192e/rtllib_wx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
129129
else
130130
ht_cap = (struct ht_capab_ele *)
131131
&network->bssht.bd_ht_cap_buf[0];
132-
is40M = (ht_cap->ChlWidth) ? 1 : 0;
133-
isShortGI = (ht_cap->ChlWidth) ?
132+
is40M = (ht_cap->chl_width) ? 1 : 0;
133+
isShortGI = (ht_cap->chl_width) ?
134134
((ht_cap->ShortGI40Mhz) ? 1 : 0) :
135135
((ht_cap->ShortGI20Mhz) ? 1 : 0);
136136

0 commit comments

Comments
 (0)