aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSean Anderson <seanga2@gmail.com>2020-09-12 17:45:43 -0400
committerTom Rini <trini@konsulko.com>2020-10-10 16:50:12 -0400
commitc3f0278e29ffae81dc24c997523a8eafba503a0c (patch)
tree77305ef1b8c3f27d47976e79ca19057f69b00f17 /net
parentc7f5b850344b1bb620f603ab7df3ee92e1fa26cf (diff)
downloadu-boot-c3f0278e29ffae81dc24c997523a8eafba503a0c.zip
u-boot-c3f0278e29ffae81dc24c997523a8eafba503a0c.tar.gz
u-boot-c3f0278e29ffae81dc24c997523a8eafba503a0c.tar.bz2
net: Expose some errors generated in net_init
net_init does not always succeed, and there is no existing mechanism to discover errors. This patch allows callers of net_init (such as net_init) to handle errors. The root issue is that eth_get_dev can fail, but net_init_loop doesn't expose that. The ideal way to fix eth_get_dev would be to return an error with ERR_PTR, but there are a lot of callers, and all of them just check if it's NULL. Another approach would be to change the signature to something like int eth_get_dev(struct udevice **pdev) but that would require rewriting all of the many callers. Signed-off-by: Sean Anderson <seanga2@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'net')
-rw-r--r--net/eth-uclass.c3
-rw-r--r--net/net.c15
2 files changed, 14 insertions, 4 deletions
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 396418e..4424d59 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -75,6 +75,9 @@ struct udevice *eth_get_dev(void)
struct eth_uclass_priv *uc_priv;
uc_priv = eth_get_uclass_priv();
+ if (!uc_priv)
+ return NULL;
+
if (!uc_priv->current)
eth_errno = uclass_first_device(UCLASS_ETH,
&uc_priv->current);
diff --git a/net/net.c b/net/net.c
index 197fde3..ad7e3b3 100644
--- a/net/net.c
+++ b/net/net.c
@@ -338,12 +338,19 @@ void net_auto_load(void)
tftp_start(TFTPGET);
}
-static void net_init_loop(void)
+static int net_init_loop(void)
{
if (eth_get_dev())
memcpy(net_ethaddr, eth_get_ethaddr(), 6);
+ else
+ /*
+ * Not ideal, but there's no way to get the actual error, and I
+ * don't feel like fixing all the users of eth_get_dev to deal
+ * with errors.
+ */
+ return -ENONET;
- return;
+ return 0;
}
static void net_clear_handlers(void)
@@ -358,7 +365,7 @@ static void net_cleanup_loop(void)
net_clear_handlers();
}
-void net_init(void)
+int net_init(void)
{
static int first_call = 1;
@@ -381,7 +388,7 @@ void net_init(void)
first_call = 0;
}
- net_init_loop();
+ return net_init_loop();
}
/**********************************************************************/