From 0e7cfdb7e8937644646c3115814b6c884674ae0c Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 1 Oct 2023 15:08:42 +0200
Subject: [PATCH] Revert "Disable Ethernet library if CONFIG_ETH_ENABLED not
 defined in sdkconfig.h (#8595)"

This reverts commit fff900d341dc5a55324af54ba3a211ed578ec931.
---
 libraries/Ethernet/src/ETH.cpp     | 5 -----
 libraries/Ethernet/src/ETH.h       | 5 -----
 libraries/WiFi/src/WiFiGeneric.cpp | 4 ----
 libraries/WiFi/src/WiFiGeneric.h   | 2 --
 4 files changed, 16 deletions(-)

diff --git a/libraries/Ethernet/src/ETH.cpp b/libraries/Ethernet/src/ETH.cpp
index 418135d12b5..166f212f3a7 100644
--- a/libraries/Ethernet/src/ETH.cpp
+++ b/libraries/Ethernet/src/ETH.cpp
@@ -18,9 +18,6 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "sdkconfig.h"
-#ifdef CONFIG_ETH_ENABLED
-
 #include "ETH.h"
 #include "esp_system.h"
 #if ESP_IDF_VERSION_MAJOR > 3
@@ -604,5 +601,3 @@ String ETHClass::macAddress(void)
 }
 
 ETHClass ETH;
-
-#endif  //  CONFIG_ETH_ENABLED
\ No newline at end of file
diff --git a/libraries/Ethernet/src/ETH.h b/libraries/Ethernet/src/ETH.h
index 420b427707e..7fc14f59cb3 100644
--- a/libraries/Ethernet/src/ETH.h
+++ b/libraries/Ethernet/src/ETH.h
@@ -21,9 +21,6 @@
 #ifndef _ETH_H_
 #define _ETH_H_
 
-#include "sdkconfig.h"
-#ifdef CONFIG_ETH_ENABLED
-
 #include "WiFi.h"
 #include "esp_system.h"
 #include "esp_eth.h"
@@ -109,6 +106,4 @@ class ETHClass {
 
 extern ETHClass ETH;
 
-#endif  //  CONFIG_ETH_ENABLED
-
 #endif /* _ETH_H_ */
diff --git a/libraries/WiFi/src/WiFiGeneric.cpp b/libraries/WiFi/src/WiFiGeneric.cpp
index a94f2ab7ff3..a930c308cb2 100644
--- a/libraries/WiFi/src/WiFiGeneric.cpp
+++ b/libraries/WiFi/src/WiFiGeneric.cpp
@@ -426,7 +426,6 @@ static void _arduino_event_cb(void* arg, esp_event_base_t event_base, int32_t ev
 	/*
 	 * ETH
 	 * */
-#ifdef CONFIG_ETH_ENABLED
 	} else if (event_base == ETH_EVENT && event_id == ETHERNET_EVENT_CONNECTED) {
 		log_v("Ethernet Link Up");
     	arduino_event.event_id = ARDUINO_EVENT_ETH_CONNECTED;
@@ -447,7 +446,6 @@ static void _arduino_event_cb(void* arg, esp_event_base_t event_base, int32_t ev
     	#endif
         arduino_event.event_id = ARDUINO_EVENT_ETH_GOT_IP;
     	memcpy(&arduino_event.event_info.got_ip, event_data, sizeof(ip_event_got_ip_t));
-#endif  //  CONFIG_ETH_ENABLED
 
 	/*
 	 * IPv6
@@ -596,12 +594,10 @@ static bool _start_network_event_task(){
         return false;
     }
 
-#ifdef CONFIG_ETH_ENABLED
     if(esp_event_handler_instance_register(ETH_EVENT, ESP_EVENT_ANY_ID, &_arduino_event_cb, NULL, NULL)){
         log_e("event_handler_instance_register for ETH_EVENT Failed!");
         return false;
     }
-#endif  //  CONFIG_ETH_ENABLED
 
     if(esp_event_handler_instance_register(WIFI_PROV_EVENT, ESP_EVENT_ANY_ID, &_arduino_event_cb, NULL, NULL)){
         log_e("event_handler_instance_register for WIFI_PROV_EVENT Failed!");
diff --git a/libraries/WiFi/src/WiFiGeneric.h b/libraries/WiFi/src/WiFiGeneric.h
index ec624629da4..525f693a2eb 100644
--- a/libraries/WiFi/src/WiFiGeneric.h
+++ b/libraries/WiFi/src/WiFiGeneric.h
@@ -92,9 +92,7 @@ typedef union {
 	ip_event_got_ip_t got_ip;
 	ip_event_got_ip6_t got_ip6;
 	smartconfig_event_got_ssid_pswd_t sc_got_ssid_pswd;
-#ifdef CONFIG_ETH_ENABLED
 	esp_eth_handle_t eth_connected;
-#endif
 	wifi_sta_config_t prov_cred_recv;
 	wifi_prov_sta_fail_reason_t prov_fail_reason;
 } arduino_event_info_t;