public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Bernhard Nortmann <bernhard.nortmann@web.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [RESEND PATCH v3 3/5] net: avoid eth_unregister() call when function is unavailable
Date: Mon, 14 Sep 2015 15:29:45 +0200	[thread overview]
Message-ID: <1442237387-29474-4-git-send-email-bernhard.nortmann@web.de> (raw)
In-Reply-To: <1442237387-29474-1-git-send-email-bernhard.nortmann@web.de>

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>
---

Changes in v3: None
Changes in v2:
- add "net:" prefix to commit message

 common/bootm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/bootm.c b/common/bootm.c
index 667c934..c0d0d09 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)
-- 
2.4.6

  parent reply	other threads:[~2015-09-14 13:29 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-14 13:29 [U-Boot] [RESEND PATCH v3 0/5] fix NetConsole for CONFIG_DM_ETH Bernhard Nortmann
2015-09-14 13:29 ` [U-Boot] [RESEND PATCH v3 1/5] net: expose eth_is_active() function to test network device state Bernhard Nortmann
2015-09-14 21:26   ` Joe Hershberger
2015-09-30 17:22   ` Joe Hershberger
2015-09-14 13:29 ` [U-Boot] [RESEND PATCH v3 2/5] net: fix netconsole when CONFIG_DM_ETH is set Bernhard Nortmann
2015-09-30 17:22   ` Joe Hershberger
2015-09-14 13:29 ` Bernhard Nortmann [this message]
2015-09-30 17:22   ` [U-Boot] [RESEND PATCH v3 3/5] net: avoid eth_unregister() call when function is unavailable Joe Hershberger
2015-09-14 13:29 ` [U-Boot] [RESEND PATCH v3 4/5] net: support NETCONSOLE option via Kconfig Bernhard Nortmann
2015-09-30 17:23   ` Joe Hershberger
2015-09-14 13:29 ` [U-Boot] [RESEND PATCH v3 5/5] sunxi: add NetConsole by default for Banana Pi/Pro Bernhard Nortmann
2015-09-30 17:23   ` Joe Hershberger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1442237387-29474-4-git-send-email-bernhard.nortmann@web.de \
    --to=bernhard.nortmann@web.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox