From b4e7ca5aac3ffb8aefb292a629f747f505eb0e38 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Fri, 20 Sep 2019 12:51:37 -0600 Subject: [PATCH] net/icmpv6/icmpv6_autoconfig.c: cmpv6_autoconfig() error handling must not overwrite overwrite the error code. --- net/icmpv6/icmpv6_autoconfig.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/icmpv6/icmpv6_autoconfig.c b/net/icmpv6/icmpv6_autoconfig.c index 12ad47b2f59..9cd3c31efa0 100644 --- a/net/icmpv6/icmpv6_autoconfig.c +++ b/net/icmpv6/icmpv6_autoconfig.c @@ -425,6 +425,8 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev) if (ret < 0) { + int senderr; + nerr("ERROR: Failed to get the router advertisement: %d (retries=%d)\n", ret, retries); @@ -432,10 +434,10 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev) * Advertisement message. */ - ret = icmpv6_send_message(dev, true); - if (ret < 0) + senderr = icmpv6_send_message(dev, true); + if (senderr < 0) { - nerr("ERROR: Failed send neighbor advertisement: %d\n", ret); + nerr("ERROR: Failed send neighbor advertisement: %d\n", senderr); } /* No off-link communications; No router address. */