Skip to content

Commit 01742a4

Browse files
treedaviesgregkh
authored andcommitted
Staging: rtl8192e: Rename variable CurSTAExtChnlOffset
Rename variable CurSTAExtChnlOffset to cur_sta_ext_chnl_offset 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-2-tdavies@darkphysics.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent aae7272 commit 01742a4

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

drivers/staging/rtl8192e/rtl819x_HT.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ struct rt_hi_throughput {
109109
u8 forced_ampdu_factor;
110110
u8 forced_mpdu_density;
111111
u8 current_op_mode;
112-
enum ht_extchnl_offset CurSTAExtChnlOffset;
112+
enum ht_extchnl_offset cur_sta_ext_chnl_offset;
113113
u8 cur_tx_bw40mhz;
114114
u8 sw_bw_in_progress;
115115
u8 current_rt2rt_aggregation;

drivers/staging/rtl8192e/rtl819x_HTProc.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -638,10 +638,10 @@ static void ht_set_connect_bw_mode_callback(struct rtllib_device *ieee)
638638
struct rt_hi_throughput *ht_info = ieee->ht_info;
639639

640640
if (ht_info->cur_bw_40mhz) {
641-
if (ht_info->CurSTAExtChnlOffset == HT_EXTCHNL_OFFSET_UPPER)
641+
if (ht_info->cur_sta_ext_chnl_offset == HT_EXTCHNL_OFFSET_UPPER)
642642
ieee->set_chan(ieee->dev,
643643
ieee->current_network.channel + 2);
644-
else if (ht_info->CurSTAExtChnlOffset ==
644+
else if (ht_info->cur_sta_ext_chnl_offset ==
645645
HT_EXTCHNL_OFFSET_LOWER)
646646
ieee->set_chan(ieee->dev,
647647
ieee->current_network.channel - 2);
@@ -650,7 +650,7 @@ static void ht_set_connect_bw_mode_callback(struct rtllib_device *ieee)
650650
ieee->current_network.channel);
651651

652652
ieee->set_bw_mode_handler(ieee->dev, HT_CHANNEL_WIDTH_20_40,
653-
ht_info->CurSTAExtChnlOffset);
653+
ht_info->cur_sta_ext_chnl_offset);
654654
} else {
655655
ieee->set_chan(ieee->dev, ieee->current_network.channel);
656656
ieee->set_bw_mode_handler(ieee->dev, HT_CHANNEL_WIDTH_20,
@@ -680,14 +680,14 @@ void ht_set_connect_bw_mode(struct rtllib_device *ieee,
680680
if (Offset == HT_EXTCHNL_OFFSET_UPPER ||
681681
Offset == HT_EXTCHNL_OFFSET_LOWER) {
682682
ht_info->cur_bw_40mhz = true;
683-
ht_info->CurSTAExtChnlOffset = Offset;
683+
ht_info->cur_sta_ext_chnl_offset = Offset;
684684
} else {
685685
ht_info->cur_bw_40mhz = false;
686-
ht_info->CurSTAExtChnlOffset = HT_EXTCHNL_OFFSET_NO_EXT;
686+
ht_info->cur_sta_ext_chnl_offset = HT_EXTCHNL_OFFSET_NO_EXT;
687687
}
688688
} else {
689689
ht_info->cur_bw_40mhz = false;
690-
ht_info->CurSTAExtChnlOffset = HT_EXTCHNL_OFFSET_NO_EXT;
690+
ht_info->cur_sta_ext_chnl_offset = HT_EXTCHNL_OFFSET_NO_EXT;
691691
}
692692

693693
netdev_dbg(ieee->dev, "%s():ht_info->bCurBW40MHz:%x\n", __func__,

drivers/staging/rtl8192e/rtllib_softmac_wx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ void rtllib_wx_sync_scan_wq(void *data)
319319
if (ieee->ht_info->current_ht_support && ieee->ht_info->enable_ht &&
320320
ieee->ht_info->cur_bw_40mhz) {
321321
b40M = 1;
322-
chan_offset = ieee->ht_info->CurSTAExtChnlOffset;
322+
chan_offset = ieee->ht_info->cur_sta_ext_chnl_offset;
323323
bandwidth = (enum ht_channel_width)ieee->ht_info->cur_bw_40mhz;
324324
ieee->set_bw_mode_handler(ieee->dev, HT_CHANNEL_WIDTH_20,
325325
HT_EXTCHNL_OFFSET_NO_EXT);

0 commit comments

Comments
 (0)