This is an automated email from the ASF dual-hosted git repository.
xiaoxiang781216 pushed a commit to branch releases/13.0
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/releases/13.0 by this push:
new 20072dc5e6a drivers/net/w5500: fix wrong variable and d_private
assignment
20072dc5e6a is described below
commit 20072dc5e6afe2649e98dbdafb582a5a6ef9ebe1
Author: hanzhijian <[email protected]>
AuthorDate: Sun Jul 12 08:39:43 2026 +0800
drivers/net/w5500: fix wrong variable and d_private assignment
Fix two latent defects in the W5500 Ethernet driver:
1. NETDEV_RXERRORS() references non-existent variables (line 1351):
In w5500_receive(), the error path uses &priv->dev but the function
parameter is named self and the device field is w_dev. This compiles
only because NETDEV_RXERRORS() expands to nothing without
CONFIG_NETDEV_STATISTICS; enabling statistics breaks the build.
2. d_private set to the device array instead of the instance (line 2069):
In w5500_initialize(), d_private was set to g_w5500 (the global array)
instead of self (the current instance). This is harmless for device 0
(g_w5500 == &g_w5500[0]) but wrong for any devno > 0 — every callback
that recovers the driver state via dev->d_private would operate on
device 0's state.
Fixes #19306
Signed-off-by: hanzhijian <[email protected]>
Author: hanzhijian <[email protected]>
---
drivers/net/w5500.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/w5500.c b/drivers/net/w5500.c
index 48ffd70e310..9ce69731c2a 100644
--- a/drivers/net/w5500.c
+++ b/drivers/net/w5500.c
@@ -1348,7 +1348,7 @@ static void w5500_receive(FAR struct w5500_driver_s *self)
{
nerr("Bad packet size dropped (%"PRIu16")\n", self->w_dev.d_len);
self->w_dev.d_len = 0;
- NETDEV_RXERRORS(&priv->dev);
+ NETDEV_RXERRORS(&self->w_dev);
continue;
}
@@ -2066,7 +2066,7 @@ int w5500_initialize(FAR struct spi_dev_s *spi_dev,
#ifdef CONFIG_NETDEV_IOCTL
self->w_dev.d_ioctl = w5500_ioctl; /* Handle network
IOCTL commands */
#endif
- self->w_dev.d_private = g_w5500; /* Used to recover
private state from dev */
+ self->w_dev.d_private = self; /* Used to recover
private state from dev */
self->spi_dev = spi_dev; /* SPI hardware
interconnect */
self->lower = lower; /* Low-level MCU
specific support */
