Skip to content

Commit d4a0d94

Browse files
treedaviesgregkh
authored andcommitted
Staging: rtl8192e: Rename variable ShortGI40Mhz
Rename variable ShortGI40Mhz to short_gi_40mhz 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-9-tdavies@darkphysics.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3b6f3b7 commit d4a0d94

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/staging/rtl8192e/rtl819x_HT.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct ht_capab_ele {
2929
u8 mimo_pwr_save:2;
3030
u8 GreenField:1;
3131
u8 ShortGI20Mhz:1;
32-
u8 ShortGI40Mhz:1;
32+
u8 short_gi_40mhz:1;
3333
u8 TxSTBC:1;
3434
u8 RxSTBC:2;
3535
u8 DelayBA:1;

drivers/staging/rtl8192e/rtl819x_HTProc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
260260
cap_ele->mimo_pwr_save = 3;
261261
cap_ele->GreenField = 0;
262262
cap_ele->ShortGI20Mhz = 1;
263-
cap_ele->ShortGI40Mhz = 1;
263+
cap_ele->short_gi_40mhz = 1;
264264

265265
cap_ele->TxSTBC = 1;
266266
cap_ele->RxSTBC = 0;
@@ -299,7 +299,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
299299
cap_ele->MCS[1] &= 0x00;
300300

301301
if (ht->iot_action & HT_IOT_ACT_DISABLE_RX_40MHZ_SHORT_GI)
302-
cap_ele->ShortGI40Mhz = 0;
302+
cap_ele->short_gi_40mhz = 0;
303303

304304
if (ieee->get_half_nmode_support_by_aps_handler(ieee->dev)) {
305305
cap_ele->chl_width = 0;
@@ -458,7 +458,7 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee)
458458
true : false);
459459

460460
ht_info->cur_short_gi_20mhz = ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false);
461-
ht_info->cur_short_gi_40mhz = ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false);
461+
ht_info->cur_short_gi_40mhz = ((pPeerHTCap->short_gi_40mhz == 1) ? true : false);
462462

463463
ht_info->current_ampdu_enable = ht_info->ampdu_enable;
464464
if (ieee->rtllib_ap_sec_type &&

drivers/staging/rtl8192e/rtllib_wx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
131131
&network->bssht.bd_ht_cap_buf[0];
132132
is40M = (ht_cap->chl_width) ? 1 : 0;
133133
isShortGI = (ht_cap->chl_width) ?
134-
((ht_cap->ShortGI40Mhz) ? 1 : 0) :
134+
((ht_cap->short_gi_40mhz) ? 1 : 0) :
135135
((ht_cap->ShortGI20Mhz) ? 1 : 0);
136136

137137
max_mcs = ht_get_highest_mcs_rate(ieee, ht_cap->MCS,

0 commit comments

Comments
 (0)