Skip to content

Commit cf75fbf

Browse files
committed
Revert "Fixed the hardware macaddress isssue for thread interfaces (#34046)"
This reverts commit 504608b.
1 parent 50971be commit cf75fbf

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

src/platform/ESP32/DiagnosticDataProviderImpl.cpp

-14
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#else
3939
#include "esp_spi_flash.h"
4040
#endif
41-
#include "esp_mac.h"
4241
#include "esp_system.h"
4342
#include "esp_wifi.h"
4443

@@ -223,7 +222,6 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
223222
ifp->type = GetInterfaceType(esp_netif_get_desc(ifa));
224223
ifp->offPremiseServicesReachableIPv4.SetNull();
225224
ifp->offPremiseServicesReachableIPv6.SetNull();
226-
#if !CHIP_DEVICE_CONFIG_ENABLE_THREAD
227225
if (esp_netif_get_mac(ifa, ifp->MacAddress) != ESP_OK)
228226
{
229227
ChipLogError(DeviceLayer, "Failed to get network hardware address");
@@ -232,18 +230,6 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
232230
{
233231
ifp->hardwareAddress = ByteSpan(ifp->MacAddress, 6);
234232
}
235-
#else
236-
uint8_t macAddress[8] = { 0 };
237-
if (esp_read_mac(macAddress, ESP_MAC_IEEE802154) != ESP_OK)
238-
{
239-
ChipLogError(DeviceLayer, "Failed to get network hardware address");
240-
}
241-
else
242-
{
243-
ifp->hardwareAddress = ByteSpan(macAddress, 8);
244-
}
245-
#endif
246-
247233
#ifndef CONFIG_DISABLE_IPV4
248234
if (esp_netif_get_ip_info(ifa, &ipv4_info) == ESP_OK)
249235
{

0 commit comments

Comments
 (0)