jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-26 04:06:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Core3 ethernet simplify ipv6 (#21141)

Browse Source
This commit is contained in:
s-hadinger 2024-04-10 23:12:20 +02:00 committed by GitHub
parent 5f6ac60d6b
commit 39ad5a41bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tasmota/tasmota_xdrv_driver/xdrv_82_esp32_ethernet.ino
View File

@ -107,19 +107,11 @@ void EthernetEvent(arduino_event_t *event) {
case ARDUINO_EVENT_ETH_CONNECTED: case ARDUINO_EVENT_ETH_CONNECTED:
#ifdef USE_IPV6 #ifdef USE_IPV6
#if ESP_IDF_VERSION_MAJOR < 5 // not needed anymore after Core3 esp-idf 5.1
ETH.enableIPv6(); // enable Link-Local ETH.enableIPv6(); // enable Link-Local
// workaround for the race condition in LWIP, see https://github.com/espressif/arduino-esp32/pull/9016#discussion_r1451774885 // workaround for the race condition in LWIP, see https://github.com/espressif/arduino-esp32/pull/9016#discussion_r1451774885
{ {
uint32_t i = 5; // try 5 times only uint32_t i = 5; // try 5 times only
#if ESP_IDF_VERSION_MAJOR >= 5
while (esp_netif_create_ip6_linklocal(ETH.netif()) != ESP_OK) {
delay(1);
if (i-- == 0) {
AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_ETH ">>>> HELP"));
break;
}
}
#else
while (esp_netif_create_ip6_linklocal(get_esp_interface_netif(ESP_IF_ETH)) != ESP_OK) { while (esp_netif_create_ip6_linklocal(get_esp_interface_netif(ESP_IF_ETH)) != ESP_OK) {
delay(1); delay(1);
if (i-- == 0) { if (i-- == 0) {
@ -127,9 +119,8 @@ void EthernetEvent(arduino_event_t *event) {
break; break;
} }
} }
#endif
AddLog(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ETH "ESP_IF_ETH i=%i"), i);
} }
#endif
#endif // USE_IPV6 #endif // USE_IPV6
AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_ETH D_CONNECTED " at %dMbps%s, Mac %s, Hostname %s"), AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_ETH D_CONNECTED " at %dMbps%s, Mac %s, Hostname %s"),
@ -243,11 +234,11 @@ void EthernetInit(void) {
int eth_mdio = Pin(GPIO_ETH_PHY_MDIO); // Ethernet SPI IRQ int eth_mdio = Pin(GPIO_ETH_PHY_MDIO); // Ethernet SPI IRQ
int eth_power = Pin(GPIO_ETH_PHY_POWER); // Ethernet SPI RST int eth_power = Pin(GPIO_ETH_PHY_POWER); // Ethernet SPI RST
#if ESP_IDF_VERSION_MAJOR >= 5
#ifdef USE_IPV6 #ifdef USE_IPV6
#if ESP_IDF_VERSION_MAJOR >= 5 // this seemed to cause a crash with Core2 when the call is made early
ETH.enableIPv6(); // enable Link-Local ETH.enableIPv6(); // enable Link-Local
#endif // USE_IPV6
#endif // ESP_IDF_VERSION_MAJOR >= 5 #endif // ESP_IDF_VERSION_MAJOR >= 5
#endif // USE_IPV6
bool init_ok = false; bool init_ok = false;
#if ESP_IDF_VERSION_MAJOR >= 5 #if ESP_IDF_VERSION_MAJOR >= 5