| Message ID | 1440196247-6885-4-git-send-email-bernhard.nortmann@web.de |
|---|---|
| State | RFC |
| Delegated to: | Simon Glass |
| Headers | show |
On 21 August 2015 at 16:30, Bernhard Nortmann <bernhard.nortmann@web.de> wrote: > 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> > > --- > > common/bootm.c | 2 ++ > 1 file changed, 2 insertions(+) Reviewed-by: Simon Glass <sjg@chromium.org> (nit: should have 'net:' prefix)
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)
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> --- common/bootm.c | 2 ++ 1 file changed, 2 insertions(+)