ports/esp32/modnetwork: Fix setting MAC address of ethernet devices.

damz · damz · commit a2c286537752 · 2023-01-05T21:53:50.000-08:00
`esp_eth_ioctl(ETH_CMD_S_MAC_ADDR)` sets the MAC address of the hardware
device, but we also need to notify the upper layers of the change
so that e.g. DHCP work properly.
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
@@ -350,7 +350,12 @@ STATIC mp_obj_t lan_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         if (bufinfo.len != 6) {
                             mp_raise_ValueError(MP_ERROR_TEXT("invalid buffer length"));
                         }
-                        esp_eth_ioctl(self->eth_handle, ETH_CMD_S_MAC_ADDR, bufinfo.buf);
+                        if (
+                            (esp_eth_ioctl(self->eth_handle, ETH_CMD_S_MAC_ADDR, bufinfo.buf) != ESP_OK) ||
+                            (esp_netif_set_mac(self->eth_netif, bufinfo.buf) != ESP_OK)
+                            ) {
+                            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("failed setting MAC address"));
+                        }
                         break;
                     }
                     default:

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,12 @@ STATIC mp_obj_t lan_config(size_t n_args, const mp_obj_t args, mp_map_t kwargs`
`350`	`350`	`if (bufinfo.len != 6) {`
`351`	`351`	`mp_raise_ValueError(MP_ERROR_TEXT("invalid buffer length"));`
`352`	`352`	`}`
`353`		`- esp_eth_ioctl(self->eth_handle, ETH_CMD_S_MAC_ADDR, bufinfo.buf);`
	`353`	`+ if (`
	`354`	`+ (esp_eth_ioctl(self->eth_handle, ETH_CMD_S_MAC_ADDR, bufinfo.buf) != ESP_OK) \|\|`
	`355`	`+ (esp_netif_set_mac(self->eth_netif, bufinfo.buf) != ESP_OK)`
	`356`	`+ ) {`
	`357`	`+ mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("failed setting MAC address"));`
	`358`	`+ }`
`354`	`359`	`break;`
`355`	`360`	`}`
`356`	`361`	`default:`