diff options
author | wdenk <wdenk> | 2005-04-03 14:52:59 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2005-04-03 14:52:59 +0000 |
commit | b1bf6f2c9b4aa17c6ccb7a631c99fae7f4b5744b (patch) | |
tree | 2b74636bd6705350ce5cc031b51412bd1f88671a /net | |
parent | 86c9888207b0d5b9632c4ed7a61fd09b81bb618c (diff) | |
download | u-boot-imx-b1bf6f2c9b4aa17c6ccb7a631c99fae7f4b5744b.zip u-boot-imx-b1bf6f2c9b4aa17c6ccb7a631c99fae7f4b5744b.tar.gz u-boot-imx-b1bf6f2c9b4aa17c6ccb7a631c99fae7f4b5744b.tar.bz2 |
* Patch by Richard Klingler, 03 Apr 2005:
Add call to eth_halt() in net/net.c when called functions fail
after eth_init() has been called.
* Patch by Sam Song, 3 April 2005:
- Update README.Netconsole
- Update README
Diffstat (limited to 'net')
-rw-r--r-- | net/net.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -303,8 +303,10 @@ NetLoop(proto_t protocol) #ifdef CONFIG_NET_MULTI eth_set_current(); #endif - if (eth_init(bd) < 0) + if (eth_init(bd) < 0) { + eth_halt(); return(-1); + } restart: #ifdef CONFIG_NET_MULTI @@ -383,6 +385,7 @@ restart: switch (net_check_prereq (protocol)) { case 1: /* network not configured */ + eth_halt(); return (-1); #ifdef CONFIG_NET_MULTI |