From: Bernhard Nortmann <bernhard.nortmann@web.de>
Date: Mon, 14 Sep 2015 13:29:45 +0000 (+0200)
Subject: net: avoid eth_unregister() call when function is unavailable
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4917c061a206b1c220307599bbda84b9bc4d44f2;p=project%2Fbcm63xx%2Fu-boot.git

net: avoid eth_unregister() call when function is unavailable

CONFIG_NETCONSOLE causes common/bootm.c to call eth_unregister()
for network device shutdown. However, with CONFIG_DM_ETH this
function is no longer defined.

This is a workaround to avoid the call in that case, and solely
rely on eth_halt(). In case this is insufficient, a proper way
to unregister / remove network devices needs to be implemented.

Signed-off-by: Bernhard Nortmann <bernhard.nortmann@web.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/common/bootm.c b/common/bootm.c
index 667c93471b..c0d0d09411 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -474,7 +474,9 @@ ulong bootm_disable_interrupts(void)
 #ifdef CONFIG_NETCONSOLE
 	/* Stop the ethernet stack if NetConsole could have left it up */
 	eth_halt();
+# ifndef CONFIG_DM_ETH
 	eth_unregister(eth_get_dev());
+# endif
 #endif
 
 #if defined(CONFIG_CMD_USB)