1
0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2024-09-19 20:50:41 +00:00

Merge pull request #829 from astsam2/v5.6.4.2

Fix error creating an access point below channel 36
This commit is contained in:
Christian Bremvåg 2021-03-27 07:55:31 +01:00 committed by GitHub
commit c0ce81745e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -4507,12 +4507,14 @@ static u8 rtw_ap_ch_specific_chk(_adapter *adapter, u8 ch, u8 *bw, u8 *offset, c
RT_CHANNEL_INFO *chset = adapter_to_chset(adapter); RT_CHANNEL_INFO *chset = adapter_to_chset(adapter);
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
// ignore reg domain check
#if 0
if (rtw_chset_search_ch(chset, ch) < 0) { if (rtw_chset_search_ch(chset, ch) < 0) {
RTW_WARN("%s ch:%u doesn't fit in chplan\n", caller, ch); RTW_WARN("%s ch:%u doesn't fit in chplan\n", caller, ch);
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} }
#endif
rtw_adjust_chbw(adapter, ch, bw, offset); rtw_adjust_chbw(adapter, ch, bw, offset);
if (!rtw_get_offset_by_chbw(ch, *bw, offset)) { if (!rtw_get_offset_by_chbw(ch, *bw, offset)) {

View File

@ -451,7 +451,7 @@ int rtw_ch2freq(int chan)
return 2484; return 2484;
else if (chan < 14) else if (chan < 14)
return 2407 + chan * 5; return 2407 + chan * 5;
} else if (chan >= 36 && chan <= 177) } else if (chan >= 15 && chan <= 177)
return 5000 + chan * 5; return 5000 + chan * 5;
return 0; /* not supported */ return 0; /* not supported */