Skip to content

Commit

Permalink
Revert "Fixed the hardware macaddress isssue for thread interfaces (#…
Browse files Browse the repository at this point in the history
…34046)" (#34062)

This reverts commit 504608b.

Co-authored-by: Andrei Litvin <andreilitvin@google.com>
  • Loading branch information
2 people authored and pull[bot] committed Oct 8, 2024
1 parent 0310396 commit 1705284
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions src/platform/ESP32/DiagnosticDataProviderImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#else
#include "esp_spi_flash.h"
#endif
#include "esp_mac.h"
#include "esp_system.h"
#include "esp_wifi.h"

Expand Down Expand Up @@ -223,7 +222,6 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
ifp->type = GetInterfaceType(esp_netif_get_desc(ifa));
ifp->offPremiseServicesReachableIPv4.SetNull();
ifp->offPremiseServicesReachableIPv6.SetNull();
#if !CHIP_DEVICE_CONFIG_ENABLE_THREAD
if (esp_netif_get_mac(ifa, ifp->MacAddress) != ESP_OK)
{
ChipLogError(DeviceLayer, "Failed to get network hardware address");
Expand All @@ -232,18 +230,6 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
{
ifp->hardwareAddress = ByteSpan(ifp->MacAddress, 6);
}
#else
uint8_t macAddress[8] = { 0 };
if (esp_read_mac(macAddress, ESP_MAC_IEEE802154) != ESP_OK)
{
ChipLogError(DeviceLayer, "Failed to get network hardware address");
}
else
{
ifp->hardwareAddress = ByteSpan(macAddress, 8);
}
#endif

#ifndef CONFIG_DISABLE_IPV4
if (esp_netif_get_ip_info(ifa, &ipv4_info) == ESP_OK)
{
Expand Down

0 comments on commit 1705284

Please sign in to comment.