mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-19 14:26:01 -04:00
Merge branch 'bugfix/fix_some_wifi_bugs_240516_v4.4' into 'release/v4.4'
fix(wifi): fix some wifi issues(Backport v4.4) See merge request espressif/esp-idf!30905
This commit is contained in:
commit
58c78162b9
@ -33,7 +33,7 @@ wDev_ProcessFiq = 0x400017f0;
|
|||||||
wDev_ProcessRxSucData = 0x400017f4;
|
wDev_ProcessRxSucData = 0x400017f4;
|
||||||
//ppProcTxDone = 0x40001804;
|
//ppProcTxDone = 0x40001804;
|
||||||
//pm_tx_data_done_process = 0x40001808;
|
//pm_tx_data_done_process = 0x40001808;
|
||||||
ieee80211_encap_esfbuf = 0x4000185c;
|
/*ieee80211_encap_esfbuf = 0x4000185c;*/
|
||||||
/*sta_input = 0x40001870;*/
|
/*sta_input = 0x40001870;*/
|
||||||
ieee80211_crypto_decap = 0x4000189c;
|
ieee80211_crypto_decap = 0x4000189c;
|
||||||
ieee80211_decap = 0x400018a0;
|
ieee80211_decap = 0x400018a0;
|
||||||
|
@ -1516,7 +1516,7 @@ is_lmac_idle = 0x400015e8;
|
|||||||
lmacAdjustTimestamp = 0x400015ec;
|
lmacAdjustTimestamp = 0x400015ec;
|
||||||
lmacDiscardAgedMSDU = 0x400015f0;
|
lmacDiscardAgedMSDU = 0x400015f0;
|
||||||
/*lmacDiscardMSDU = 0x400015f4;*/
|
/*lmacDiscardMSDU = 0x400015f4;*/
|
||||||
lmacEndFrameExchangeSequence = 0x400015f8;
|
/*lmacEndFrameExchangeSequence = 0x400015f8;*/
|
||||||
lmacIsIdle = 0x400015fc;
|
lmacIsIdle = 0x400015fc;
|
||||||
lmacIsLongFrame = 0x40001600;
|
lmacIsLongFrame = 0x40001600;
|
||||||
lmacMSDUAged = 0x40001604;
|
lmacMSDUAged = 0x40001604;
|
||||||
@ -1717,7 +1717,7 @@ ic_ebuf_recycle_rx = 0x40001844;
|
|||||||
ic_ebuf_recycle_tx = 0x40001848;
|
ic_ebuf_recycle_tx = 0x40001848;
|
||||||
ic_reset_rx_ba = 0x4000184c;
|
ic_reset_rx_ba = 0x4000184c;
|
||||||
ieee80211_align_eb = 0x40001850;
|
ieee80211_align_eb = 0x40001850;
|
||||||
ieee80211_ampdu_reorder = 0x40001854;
|
/*ieee80211_ampdu_reorder = 0x40001854;*/
|
||||||
ieee80211_ampdu_start_age_timer = 0x40001858;
|
ieee80211_ampdu_start_age_timer = 0x40001858;
|
||||||
/*ieee80211_encap_esfbuf = 0x4000185c;*/
|
/*ieee80211_encap_esfbuf = 0x4000185c;*/
|
||||||
ieee80211_is_tx_allowed = 0x40001860;
|
ieee80211_is_tx_allowed = 0x40001860;
|
||||||
@ -1729,7 +1729,7 @@ wifi_get_macaddr = 0x40001874;
|
|||||||
wifi_rf_phy_disable = 0x40001878;
|
wifi_rf_phy_disable = 0x40001878;
|
||||||
wifi_rf_phy_enable = 0x4000187c;
|
wifi_rf_phy_enable = 0x4000187c;
|
||||||
ic_ebuf_alloc = 0x40001880;
|
ic_ebuf_alloc = 0x40001880;
|
||||||
ieee80211_classify = 0x40001884;
|
/*ieee80211_classify = 0x40001884;*/
|
||||||
ieee80211_copy_eb_header = 0x40001888;
|
ieee80211_copy_eb_header = 0x40001888;
|
||||||
ieee80211_recycle_cache_eb = 0x4000188c;
|
ieee80211_recycle_cache_eb = 0x4000188c;
|
||||||
ieee80211_search_node = 0x40001890;
|
ieee80211_search_node = 0x40001890;
|
||||||
|
@ -1816,7 +1816,7 @@ is_lmac_idle = 0x400052f8;
|
|||||||
lmacAdjustTimestamp = 0x40005304;
|
lmacAdjustTimestamp = 0x40005304;
|
||||||
lmacDiscardAgedMSDU = 0x40005310;
|
lmacDiscardAgedMSDU = 0x40005310;
|
||||||
/*lmacDiscardMSDU = 0x4000531c;*/
|
/*lmacDiscardMSDU = 0x4000531c;*/
|
||||||
lmacEndFrameExchangeSequence = 0x40005328;
|
/*lmacEndFrameExchangeSequence = 0x40005328;*/
|
||||||
lmacIsIdle = 0x40005334;
|
lmacIsIdle = 0x40005334;
|
||||||
lmacIsLongFrame = 0x40005340;
|
lmacIsLongFrame = 0x40005340;
|
||||||
lmacMSDUAged = 0x4000534c;
|
lmacMSDUAged = 0x4000534c;
|
||||||
@ -2024,7 +2024,7 @@ ic_ebuf_recycle_rx = 0x40005a24;
|
|||||||
ic_ebuf_recycle_tx = 0x40005a30;
|
ic_ebuf_recycle_tx = 0x40005a30;
|
||||||
ic_reset_rx_ba = 0x40005a3c;
|
ic_reset_rx_ba = 0x40005a3c;
|
||||||
ieee80211_align_eb = 0x40005a48;
|
ieee80211_align_eb = 0x40005a48;
|
||||||
ieee80211_ampdu_reorder = 0x40005a54;
|
/* ieee80211_ampdu_reorder = 0x40005a54; */
|
||||||
ieee80211_ampdu_start_age_timer = 0x40005a60;
|
ieee80211_ampdu_start_age_timer = 0x40005a60;
|
||||||
/* ieee80211_encap_esfbuf = 0x40005a6c; */
|
/* ieee80211_encap_esfbuf = 0x40005a6c; */
|
||||||
ieee80211_is_tx_allowed = 0x40005a78;
|
ieee80211_is_tx_allowed = 0x40005a78;
|
||||||
@ -2036,7 +2036,7 @@ wifi_get_macaddr = 0x40005ab4;
|
|||||||
wifi_rf_phy_disable = 0x40005ac0;
|
wifi_rf_phy_disable = 0x40005ac0;
|
||||||
wifi_rf_phy_enable = 0x40005acc;
|
wifi_rf_phy_enable = 0x40005acc;
|
||||||
ic_ebuf_alloc = 0x40005ad8;
|
ic_ebuf_alloc = 0x40005ad8;
|
||||||
ieee80211_classify = 0x40005ae4;
|
/*ieee80211_classify = 0x40005ae4;*/
|
||||||
ieee80211_copy_eb_header = 0x40005af0;
|
ieee80211_copy_eb_header = 0x40005af0;
|
||||||
ieee80211_recycle_cache_eb = 0x40005afc;
|
ieee80211_recycle_cache_eb = 0x40005afc;
|
||||||
ieee80211_search_node = 0x40005b08;
|
ieee80211_search_node = 0x40005b08;
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 946d1e0a8be5adca12c1c1d360a4c7260b9de7a8
|
Subproject commit a58c6341a9447dfa4779593b04d39e85ed96fda0
|
@ -150,8 +150,8 @@ static void wifi_scan(void)
|
|||||||
ESP_ERROR_CHECK(esp_wifi_start());
|
ESP_ERROR_CHECK(esp_wifi_start());
|
||||||
esp_wifi_scan_start(NULL, true);
|
esp_wifi_scan_start(NULL, true);
|
||||||
ESP_LOGI(TAG, "Max AP number ap_info can hold = %u", number);
|
ESP_LOGI(TAG, "Max AP number ap_info can hold = %u", number);
|
||||||
ESP_ERROR_CHECK(esp_wifi_scan_get_ap_records(&number, ap_info));
|
|
||||||
ESP_ERROR_CHECK(esp_wifi_scan_get_ap_num(&ap_count));
|
ESP_ERROR_CHECK(esp_wifi_scan_get_ap_num(&ap_count));
|
||||||
|
ESP_ERROR_CHECK(esp_wifi_scan_get_ap_records(&number, ap_info));
|
||||||
ESP_LOGI(TAG, "Total APs scanned = %u, actual AP number ap_info holds = %u", ap_count, number);
|
ESP_LOGI(TAG, "Total APs scanned = %u, actual AP number ap_info holds = %u", ap_count, number);
|
||||||
for (int i = 0; i < number; i++) {
|
for (int i = 0; i < number; i++) {
|
||||||
ESP_LOGI(TAG, "SSID \t\t%s", ap_info[i].ssid);
|
ESP_LOGI(TAG, "SSID \t\t%s", ap_info[i].ssid);
|
||||||
|
Loading…
Reference in New Issue
Block a user