Skip to content

Commit 80d83c2

Browse files
committed
Lower Linux kernel version and clean up the PR
1 parent 04e362c commit 80d83c2

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

core/rtw_rf.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ s8 rtw_rf_get_kfree_tx_gain_offset(_adapter *padapter, u8 path, u8 ch)
12251225
kfree_offset = kfree_data->bb_gain[bb_gain_sel][path];
12261226
if (IS_HARDWARE_TYPE_8723D(padapter))
12271227
RTW_INFO("%s path:%s, ch:%u, bb_gain_sel:%d, kfree_offset:%d\n"
1228-
, __func__, (path == 0)?"S1":"S0",
1228+
, __func__, (path == 0)?"S1":"S0",
12291229
ch, bb_gain_sel, kfree_offset);
12301230
else
12311231
RTW_INFO("%s path:%u, ch:%u, bb_gain_sel:%d, kfree_offset:%d\n"
@@ -1256,7 +1256,7 @@ void rtw_rf_set_tx_gain_offset(_adapter *adapter, u8 path, s8 offset)
12561256
target_path = path;
12571257
RTW_INFO("kfree gain_offset 0x55:0x%x ", rtw_hal_read_rfreg(adapter, target_path, 0x55, 0xffffffff));
12581258
}
1259-
1259+
12601260
switch (rtw_get_chip_type(adapter)) {
12611261
#ifdef CONFIG_RTL8723D
12621262
case RTL8723D:
@@ -1311,7 +1311,7 @@ void rtw_rf_set_tx_gain_offset(_adapter *adapter, u8 path, s8 offset)
13111311
rtw_warn_on(1);
13121312
break;
13131313
}
1314-
1314+
13151315
if (IS_HARDWARE_TYPE_8723D(adapter)) {
13161316
if (path == PPG_8723D_S1)
13171317
val32 = rtw_hal_read_rfreg(adapter, target_path, 0x55, 0xffffffff);

include/hal_data.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -332,12 +332,11 @@ struct txpwr_lmt_ent {
332332
[MAX_TX_COUNT];
333333
#endif
334334

335-
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 1))
335+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0))
336336
char regd_name[];
337-
#else
338-
char regd_name[0];
339-
#endif
340-
337+
#else
338+
char regd_name[0];
339+
#endif
341340
};
342341
#endif /* CONFIG_TXPWR_LIMIT */
343342

include/rtw_rf.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,11 @@ struct regd_exc_ent {
173173
_list list;
174174
char country[2];
175175
u8 domain;
176-
177-
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 1))
176+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 1))
178177
char regd_name[];
179-
#else
180-
char regd_name[0];
181-
#endif
178+
#else
179+
char regd_name[0];
180+
#endif
182181
};
183182

184183
void dump_regd_exc_list(void *sel, struct rf_ctl_t *rfctl);

0 commit comments

Comments
 (0)