Merge branch 'bugfix/fix_wifi_interface_use_v4.0' into 'release/v4.0'

esp_wifi: Modify ESP_IF_WIFI_STA to WIFI_IF_STA (backport v4.0)

See merge request espressif/esp-idf!12168

components/driver/test/test_adc2.c

@@ -82,7 +82,7 @@ TEST_CASE("adc2 work with wifi","[adc]")
         },
     };
     TEST_ESP_OK(esp_wifi_set_mode(WIFI_MODE_STA));
-    TEST_ESP_OK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config));
+    TEST_ESP_OK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
     
     //test read value
     TEST_ESP_OK( adc2_get_raw( ADC2_CHANNEL_8, ADC_WIDTH_12Bit, &read_raw ));
@@ -205,7 +205,7 @@ TEST_CASE("adc1 and i2s work with wifi","[adc]")
         },
     };
     TEST_ESP_OK(esp_wifi_set_mode(WIFI_MODE_STA));
-    TEST_ESP_OK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config));
+    TEST_ESP_OK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
     i2s_adc_test();
     //now start wifi
     printf("wifi start...\n");

components/esp_wifi/test/test_wifi.c

@@ -74,7 +74,7 @@ static void test_wifi_init_deinit(wifi_init_config_t *cfg, wifi_config_t* wifi_c
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_set_mode"));
     TEST_ESP_OK(esp_wifi_set_mode(WIFI_MODE_STA));
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_set_config"));
-    TEST_ESP_OK(esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_config));
+    TEST_ESP_OK(esp_wifi_set_config(WIFI_IF_STA, wifi_config));
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_deinit..."));
     TEST_ESP_OK(esp_wifi_deinit());
 }
@@ -88,7 +88,7 @@ static void test_wifi_start_stop(wifi_init_config_t *cfg, wifi_config_t* wifi_co
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_set_mode"));
     TEST_ESP_OK(esp_wifi_set_mode(WIFI_MODE_STA));
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_set_config"));
-    TEST_ESP_OK(esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_config));
+    TEST_ESP_OK(esp_wifi_set_config(WIFI_IF_STA, wifi_config));
     //now start wifi
     ESP_LOGI(TAG, EMPH_STR("esp_wifi_start..."));
     TEST_ESP_OK(esp_wifi_start());
@@ -238,7 +238,7 @@ static void send_ds2ds_packet(void)
 
     // send packet 20 times to make sure receiver will get this packet
     for (uint16_t i = 0; i < 20; i++) {
-        esp_wifi_80211_tx(ESP_IF_WIFI_AP, ds2ds_pdu, sizeof(ds2ds_pdu), true);
+        esp_wifi_80211_tx(WIFI_IF_AP, ds2ds_pdu, sizeof(ds2ds_pdu), true);
         vTaskDelay(50 / portTICK_PERIOD_MS);
     }
     stop_wifi();
@@ -300,7 +300,7 @@ static void test_wifi_connection_softap(void)
 
     start_wifi_as_softap();
 
-    TEST_ESP_OK(esp_wifi_get_mac(ESP_IF_WIFI_AP, mac));
+    TEST_ESP_OK(esp_wifi_get_mac(WIFI_IF_AP, mac));
     sprintf(mac_str, MACSTR, MAC2STR(mac));
 
     unity_send_signal_param("SoftAP mac", mac_str);

components/lwip/apps/dhcpserver/dhcpserver.c

@@ -329,7 +329,7 @@ static u8_t *add_offer_options(u8_t *optptr)
         //bzero(&if_ip, sizeof(struct ip_info));
         memset(&if_ip , 0x00, sizeof(tcpip_adapter_ip_info_t));
 
-        tcpip_adapter_get_ip_info(ESP_IF_WIFI_AP, &if_ip);
+        tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &if_ip);
 
         if (!ip4_addr_isany_val(if_ip.gw)) {
             *optptr++ = DHCP_OPTION_ROUTER;

components/lwip/port/esp32/netif/dhcp_state.c

@@ -84,4 +84,4 @@ void dhcp_ip_addr_erase(void *netif)
             nvs_close(nvs);
         }
     }
-}
+}

components/tcpip_adapter/event_handlers.c

@@ -122,9 +122,9 @@ static void handle_ap_start(void *arg, esp_event_base_t base, int32_t event_id,
     tcpip_adapter_ip_info_t ap_ip;
     uint8_t ap_mac[6];
 
-    API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_AP, (wifi_rxcb_t)tcpip_adapter_ap_input), ESP_OK);
+    API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(WIFI_IF_AP, (wifi_rxcb_t)tcpip_adapter_ap_input), ESP_OK);
     API_CALL_CHECK("esp_wifi_internal_reg_netstack_buf_cb",esp_wifi_internal_reg_netstack_buf_cb(esp_netif_netstack_buf_ref, esp_netif_netstack_buf_free), ESP_OK);
-    API_CALL_CHECK("esp_wifi_mac_get",  esp_wifi_get_mac(ESP_IF_WIFI_AP, ap_mac), ESP_OK);
+    API_CALL_CHECK("esp_wifi_mac_get",  esp_wifi_get_mac(WIFI_IF_AP, ap_mac), ESP_OK);
 
     tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ap_ip);
     tcpip_adapter_ap_start(ap_mac, &ap_ip);
@@ -132,7 +132,7 @@ static void handle_ap_start(void *arg, esp_event_base_t base, int32_t event_id,
 
 static void handle_ap_stop(void *arg, esp_event_base_t base, int32_t event_id, void *data)
 {
-    API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_AP, NULL), ESP_OK);
+    API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(WIFI_IF_AP, NULL), ESP_OK);
 
     tcpip_adapter_stop(TCPIP_ADAPTER_IF_AP);
 }
@@ -143,7 +143,7 @@ static void handle_sta_start(void *arg, esp_event_base_t base, int32_t event_id,
     uint8_t sta_mac[6];
 
     API_CALL_CHECK("esp_wifi_internal_reg_netstack_buf_cb",esp_wifi_internal_reg_netstack_buf_cb(esp_netif_netstack_buf_ref, esp_netif_netstack_buf_free), ESP_OK);
-    API_CALL_CHECK("esp_wifi_mac_get",  esp_wifi_get_mac(ESP_IF_WIFI_STA, sta_mac), ESP_OK);
+    API_CALL_CHECK("esp_wifi_mac_get",  esp_wifi_get_mac(WIFI_IF_STA, sta_mac), ESP_OK);
     tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &sta_ip);
     tcpip_adapter_sta_start(sta_mac, &sta_ip);
 }
@@ -157,7 +157,7 @@ static void handle_sta_connected(void *arg, esp_event_base_t base, int32_t event
 {
     tcpip_adapter_dhcp_status_t status;
 
-    API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_STA, (wifi_rxcb_t)tcpip_adapter_sta_input), ESP_OK);
+    API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(WIFI_IF_STA, (wifi_rxcb_t)tcpip_adapter_sta_input), ESP_OK);
 
     tcpip_adapter_up(TCPIP_ADAPTER_IF_STA);
 
@@ -196,7 +196,7 @@ static void handle_sta_connected(void *arg, esp_event_base_t base, int32_t event
 static void handle_sta_disconnected(void *arg, esp_event_base_t base, int32_t event_id, void *data)
 {
     tcpip_adapter_down(TCPIP_ADAPTER_IF_STA);
-    API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_STA, NULL), ESP_OK);
+    API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(WIFI_IF_STA, NULL), ESP_OK);
 }
 
 

components/tcpip_adapter/tcpip_adapter_lwip.c

@@ -702,7 +702,7 @@ esp_err_t tcpip_adapter_dhcps_option(tcpip_adapter_dhcp_option_mode_t opt_op, tc
 
             if (poll->enable) {
                 memset(&info, 0x00, sizeof(tcpip_adapter_ip_info_t));
-                tcpip_adapter_get_ip_info(ESP_IF_WIFI_AP, &info);
+                tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &info);
                 softap_ip = htonl(info.ip.addr);
                 start_ip = htonl(poll->start_ip.addr);
                 end_ip = htonl(poll->end_ip.addr);
@@ -874,7 +874,7 @@ esp_err_t tcpip_adapter_dhcps_start(tcpip_adapter_if_t tcpip_if)
 
         if (p_netif != NULL && netif_is_up(p_netif)) {
             tcpip_adapter_ip_info_t default_ip;
-            tcpip_adapter_get_ip_info(ESP_IF_WIFI_AP, &default_ip);
+            tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &default_ip);
             dhcps_start(p_netif, default_ip.ip);
             dhcps_status = TCPIP_ADAPTER_DHCP_STARTED;
             ESP_LOGD(TAG, "dhcp server start successfully");

components/wifi_provisioning/src/manager.c

@@ -1104,7 +1104,7 @@ esp_err_t wifi_prov_mgr_is_provisioned(bool *provisioned)
 
     /* Get Wi-Fi Station configuration */
     wifi_config_t wifi_cfg;
-    if (esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg) != ESP_OK) {
+    if (esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK) {
         return ESP_FAIL;
     }
 
@@ -1163,7 +1163,7 @@ esp_err_t wifi_prov_mgr_configure_sta(wifi_config_t *wifi_cfg)
     }
     /* Configure Wi-Fi station with host credentials
      * provided during provisioning */
-    if (esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_cfg) != ESP_OK) {
+    if (esp_wifi_set_config(WIFI_IF_STA, wifi_cfg) != ESP_OK) {
         ESP_LOGE(TAG, "Failed to set Wi-Fi configuration");
         RELEASE_LOCK(prov_ctx_lock);
         return ESP_FAIL;
@@ -1433,14 +1433,14 @@ esp_err_t wifi_prov_mgr_start_provisioning(wifi_prov_security_t security, const
      * to the AP whose credentials were present earlier */
     wifi_config_t wifi_cfg_empty, wifi_cfg_old;
     memset(&wifi_cfg_empty, 0, sizeof(wifi_config_t));
-    esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg_old);
+    esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg_old);
     err = esp_wifi_set_storage(WIFI_STORAGE_RAM);
     if (err != ESP_OK) {
         ESP_LOGE(TAG, "Failed to set Wi-Fi storage to RAM");
         RELEASE_LOCK(prov_ctx_lock);
         return err;
     }
-    esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_cfg_empty);
+    esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg_empty);
     if (err != ESP_OK) {
         ESP_LOGE(TAG, "Failed to set empty Wi-Fi credentials");
         RELEASE_LOCK(prov_ctx_lock);
@@ -1526,7 +1526,7 @@ esp_err_t wifi_prov_mgr_start_provisioning(wifi_prov_security_t security, const
 err:
     prov_ctx->prov_state = WIFI_PROV_STATE_IDLE;
     esp_wifi_set_storage(WIFI_STORAGE_FLASH);
-    esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_cfg_old);
+    esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg_old);
 
 exit:
     RELEASE_LOCK(prov_ctx_lock);

components/wifi_provisioning/src/scheme_softap.c

@@ -60,7 +60,7 @@ static esp_err_t start_wifi_ap(const char *ssid, const char *pass)
         ESP_LOGE(TAG, "Failed to set Wi-Fi mode : %d", err);
         return err;
     }
-    err = esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config);
+    err = esp_wifi_set_config(WIFI_IF_AP, &wifi_config);
     if (err != ESP_OK) {
         ESP_LOGE(TAG, "Failed to set Wi-Fi config : %d", err);
         return err;

components/wpa_supplicant/src/rsn_supp/wpa.c

@@ -1021,7 +1021,7 @@ int   ieee80211w_set_keys(struct wpa_sm *sm,
 		if (keyidx > 4095) {
 			return -1;
 		}
-		return esp_wifi_set_igtk_internal(ESP_IF_WIFI_STA, igtk);
+		return esp_wifi_set_igtk_internal(WIFI_IF_STA, igtk);
 	}
 	return 0;
 #else
@@ -2151,7 +2151,7 @@ int wpa_set_bss(char *macddr, char * bssid, u8 pairwise_cipher, u8 group_cipher,
     if (esp_wifi_sta_pmf_enabled()) {
         wifi_config_t wifi_cfg;
 
-        esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg);
+        esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg);
         sm->pmf_cfg = wifi_cfg.sta.pmf_cfg;
         sm->mgmt_group_cipher = cipher_type_map_public_to_supp(esp_wifi_sta_get_mgmt_group_cipher());
     } else {

examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c

@@ -160,7 +160,7 @@ static bool wifi_cmd_sta_join(const char *ssid, const char *pass)
     reconnect = true;
     esp_wifi_disconnect();
     //ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); //by snake
-    ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
+    ESP_ERROR_CHECK( esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
     esp_wifi_connect();
 
     xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000 / portTICK_RATE_MS);
@@ -240,7 +240,7 @@ static bool wifi_cmd_ap_set(const char *ssid, const char *pass)
     }
 
     ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP));
-    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config));
+    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_AP, &wifi_config));
     return true;
 }
 

examples/common_components/protocol_examples_common/connect.c

@@ -136,7 +136,7 @@ static void start()
     };
     ESP_LOGI(TAG, "Connecting to %s...", wifi_config.sta.ssid);
     ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
-    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config));
+    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
     ESP_ERROR_CHECK(esp_wifi_start());
     esp_wifi_connect();
     s_connection_name = CONFIG_EXAMPLE_WIFI_SSID;

examples/ethernet/eth2ap/main/ethernet_example_main.c

@@ -81,7 +81,7 @@ static void eth2wifi_flow_control_task(void *args)
                 do {
                     vTaskDelay(pdMS_TO_TICKS(timeout));
                     timeout += 2;
-                    res = esp_wifi_internal_tx(ESP_IF_WIFI_AP, msg.packet, msg.length);
+                    res = esp_wifi_internal_tx(WIFI_IF_AP, msg.packet, msg.length);
                 } while (res && timeout < FLOW_CONTROL_WIFI_SEND_TIMEOUT_MS);
                 if (res != ESP_OK) {
                     ESP_LOGE(TAG, "WiFi send packet failed: %d", res);
@@ -129,12 +129,12 @@ static void wifi_event_handler(void *arg, esp_event_base_t event_base,
     case WIFI_EVENT_AP_STACONNECTED:
         ESP_LOGI(TAG, "Wi-Fi AP got a station connected");
         s_sta_is_connected = true;
-        esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_AP, pkt_wifi2eth);
+        esp_wifi_internal_reg_rxcb(WIFI_IF_AP, pkt_wifi2eth);
         break;
     case WIFI_EVENT_AP_STADISCONNECTED:
         ESP_LOGI(TAG, "Wi-Fi AP got a station disconnected");
         s_sta_is_connected = false;
-        esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_AP, NULL);
+        esp_wifi_internal_reg_rxcb(WIFI_IF_AP, NULL);
         break;
     default:
         break;
@@ -214,7 +214,7 @@ static void initialize_wifi(void)
         wifi_config.ap.authmode = WIFI_AUTH_OPEN;
     }
     ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP));
-    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config));
+    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_AP, &wifi_config));
 }
 
 static esp_err_t initialize_flow_control(void)

examples/protocols/esp_local_ctrl/main/app_main.c

@@ -87,7 +87,7 @@ esp_err_t wifi_init_sta(void)
         },
     };
     ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );
-    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
+    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
     ESP_ERROR_CHECK(esp_wifi_start() );
 
     ESP_LOGI(TAG, "wifi_init_sta finished.");

examples/provisioning/ble_prov/main/app_prov.c

@@ -287,7 +287,7 @@ esp_err_t app_prov_is_provisioned(bool *provisioned)
 
     /* Get WiFi Station configuration */
     wifi_config_t wifi_cfg;
-    if (esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg) != ESP_OK) {
+    if (esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK) {
         return ESP_FAIL;
     }
 
@@ -308,7 +308,7 @@ esp_err_t app_prov_configure_sta(wifi_config_t *wifi_cfg)
     }
     /* Configure WiFi station with host credentials
      * provided during provisioning */
-    if (esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_cfg) != ESP_OK) {
+    if (esp_wifi_set_config(WIFI_IF_STA, wifi_cfg) != ESP_OK) {
         ESP_LOGE(TAG, "Failed to set WiFi configuration");
         return ESP_FAIL;
     }

examples/provisioning/console_prov/main/app_prov.c

@@ -225,7 +225,7 @@ esp_err_t app_prov_is_provisioned(bool *provisioned)
 
     /* Get WiFi Station configuration */
     wifi_config_t wifi_cfg;
-    if (esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg) != ESP_OK) {
+    if (esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK) {
         return ESP_FAIL;
     }
 
@@ -246,7 +246,7 @@ esp_err_t app_prov_configure_sta(wifi_config_t *wifi_cfg)
     }
     /* Configure WiFi station with host credentials
      * provided during provisioning */
-    if (esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_cfg) != ESP_OK) {
+    if (esp_wifi_set_config(WIFI_IF_STA, wifi_cfg) != ESP_OK) {
         ESP_LOGE(TAG, "Failed to set WiFi configuration");
         return ESP_FAIL;
     }

examples/provisioning/custom_config/main/app_prov.c

@@ -250,7 +250,7 @@ esp_err_t app_prov_is_provisioned(bool *provisioned)
 
     /* Get WiFi Station configuration */
     wifi_config_t wifi_cfg;
-    if (esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg) != ESP_OK) {
+    if (esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK) {
         return ESP_FAIL;
     }
 
@@ -271,7 +271,7 @@ esp_err_t app_prov_configure_sta(wifi_config_t *wifi_cfg)
     }
     /* Configure WiFi station with host credentials
      * provided during provisioning */
-    if (esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_cfg) != ESP_OK) {
+    if (esp_wifi_set_config(WIFI_IF_STA, wifi_cfg) != ESP_OK) {
         ESP_LOGE(TAG, "Failed to set WiFi configuration");
         return ESP_FAIL;
     }
@@ -318,7 +318,7 @@ static esp_err_t start_wifi_ap(const char *ssid, const char *pass)
         ESP_LOGE(TAG, "Failed to set WiFi mode : %d", err);
         return err;
     }
-    err = esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config);
+    err = esp_wifi_set_config(WIFI_IF_AP, &wifi_config);
     if (err != ESP_OK) {
         ESP_LOGE(TAG, "Failed to set WiFi config : %d", err);
         return err;

examples/provisioning/softap_prov/main/app_prov.c

@@ -236,7 +236,7 @@ esp_err_t app_prov_is_provisioned(bool *provisioned)
 
     /* Get WiFi Station configuration */
     wifi_config_t wifi_cfg;
-    if (esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg) != ESP_OK) {
+    if (esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK) {
         return ESP_FAIL;
     }
 
@@ -257,7 +257,7 @@ esp_err_t app_prov_configure_sta(wifi_config_t *wifi_cfg)
     }
     /* Configure WiFi station with host credentials
      * provided during provisioning */
-    if (esp_wifi_set_config(ESP_IF_WIFI_STA, wifi_cfg) != ESP_OK) {
+    if (esp_wifi_set_config(WIFI_IF_STA, wifi_cfg) != ESP_OK) {
         ESP_LOGE(TAG, "Failed to set WiFi configuration");
         return ESP_FAIL;
     }
@@ -304,7 +304,7 @@ static esp_err_t start_wifi_ap(const char *ssid, const char *pass)
         ESP_LOGE(TAG, "Failed to set WiFi mode : %d", err);
         return err;
     }
-    err = esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config);
+    err = esp_wifi_set_config(WIFI_IF_AP, &wifi_config);
     if (err != ESP_OK) {
         ESP_LOGE(TAG, "Failed to set WiFi config : %d", err);
         return err;

examples/system/console/main/cmd_wifi.c

@@ -67,7 +67,7 @@ static bool wifi_join(const char *ssid, const char *pass, int timeout_ms)
     }
 
     ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
-    ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
+    ESP_ERROR_CHECK( esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
     esp_wifi_connect();
 
     int bits = xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT,

examples/wifi/fast_scan/main/fast_scan.c

@@ -105,7 +105,7 @@ static void fast_scan(void)
         },
     };
     ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
-    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config));
+    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
     ESP_ERROR_CHECK(esp_wifi_start());
 }
 

examples/wifi/getting_started/softAP/main/softap_example_main.c

@@ -69,7 +69,7 @@ void wifi_init_softap()
     }
 
     ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP));
-    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config));
+    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_AP, &wifi_config));
     ESP_ERROR_CHECK(esp_wifi_start());
 
     ESP_LOGI(TAG, "wifi_init_softap finished. SSID:%s password:%s channel:%d",

examples/wifi/getting_started/station/main/station_example_main.c

@@ -94,7 +94,7 @@ void wifi_init_sta()
         },
     };
     ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );
-    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
+    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
     ESP_ERROR_CHECK(esp_wifi_start() );
 
     ESP_LOGI(TAG, "wifi_init_sta finished.");

examples/wifi/iperf/main/cmd_wifi.c

@@ -145,7 +145,7 @@ static bool wifi_cmd_sta_join(const char* ssid, const char* pass)
 
     reconnect = true;
     ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
-    ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
+    ESP_ERROR_CHECK( esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
     esp_wifi_connect();
 
     xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 5000/portTICK_RATE_MS);
@@ -225,7 +225,7 @@ static bool wifi_cmd_ap_set(const char* ssid, const char* pass)
     }
 
     ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_AP));
-    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config));
+    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_AP, &wifi_config));
     return true;
 }
 

examples/wifi/power_save/main/power_save.c

@@ -72,7 +72,7 @@ static void wifi_power_save(void)
         },
     };
     ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
-    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config));
+    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
     ESP_ERROR_CHECK(esp_wifi_start());
 
     ESP_LOGI(TAG, "esp_wifi_set_ps().");

examples/wifi/smart_config/main/smartconfig_main.c

@@ -69,7 +69,7 @@ static void event_handler(void* arg, esp_event_base_t event_base,
         ESP_LOGI(TAG, "PASSWORD:%s", password);
 
         ESP_ERROR_CHECK( esp_wifi_disconnect() );
-        ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
+        ESP_ERROR_CHECK( esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
         esp_wifi_connect();
     } else if (event_base == SC_EVENT && event_id == SC_EVENT_SEND_ACK_DONE) {
         xEventGroupSetBits(s_wifi_event_group, ESPTOUCH_DONE_BIT);

examples/wifi/wpa2_enterprise/main/wpa2_enterprise_main.c

@@ -110,7 +110,7 @@ static void initialise_wifi(void)
     };
     ESP_LOGI(TAG, "Setting WiFi configuration SSID %s...", wifi_config.sta.ssid);
     ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
-    ESP_ERROR_CHECK( esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
+    ESP_ERROR_CHECK( esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
     ESP_ERROR_CHECK( esp_wifi_sta_wpa2_ent_set_ca_cert(ca_pem_start, ca_pem_bytes) );
     ESP_ERROR_CHECK( esp_wifi_sta_wpa2_ent_set_cert_key(client_crt_start, client_crt_bytes,\
     		client_key_start, client_key_bytes, NULL, 0) );
@@ -133,7 +133,7 @@ static void wpa2_enterprise_example_task(void *pvParameters)
     while (1) {
         vTaskDelay(2000 / portTICK_PERIOD_MS);
 
-        if (tcpip_adapter_get_ip_info(ESP_IF_WIFI_STA, &ip) == 0) {
+        if (tcpip_adapter_get_ip_info(WIFI_IF_STA, &ip) == 0) {
             ESP_LOGI(TAG, "~~~~~~~~~~~");
             ESP_LOGI(TAG, "IP:"IPSTR, IP2STR(&ip.ip));
             ESP_LOGI(TAG, "MASK:"IPSTR, IP2STR(&ip.netmask));

examples/wifi/wps/main/wps.c

@@ -72,7 +72,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
                 if (ap_idx < s_ap_creds_num) {
                     ESP_LOGI(TAG, "Connecting to SSID: %s, Passphrase: %s",
                              wps_ap_creds[ap_idx].sta.ssid, wps_ap_creds[ap_idx].sta.password);
-                    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wps_ap_creds[ap_idx++]) );
+                    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wps_ap_creds[ap_idx++]) );
                     esp_wifi_connect();
                 }
                 s_retry_num = 0;
@@ -99,7 +99,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
                     /* If multiple AP credentials are received from WPS, connect with first one */
                     ESP_LOGI(TAG, "Connecting to SSID: %s, Passphrase: %s",
                              wps_ap_creds[0].sta.ssid, wps_ap_creds[0].sta.password);
-                    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wps_ap_creds[0]) );
+                    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wps_ap_creds[0]) );
                 }
                 /*
                  * If only one AP credential is received from WPS, there will be no event data and