net: Make netretry actually do something

netretry previously would only retry in one specific case (your MAC
address is not set) and no other. This is basically useless. In the DM
implementation for eth it turns this into a completely useless case
since an un-configured MAC address results in not even entering the
NetLoop. The behavior is now changed to retry any failed command
(rotating through the eth adapters if ethrotate != no).

It also defaulted to retry forever. It is now changed to default to not
retry

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Joe Hershberger 2015-03-22 17:09:07 -05:00 committed by Simon Glass
parent d2eaec6006
commit 5c421331d5

View File

@ -527,6 +527,8 @@ restart:
(*x)();
}
if (net_state == NETLOOP_FAIL)
NetStartAgain();
switch (net_state) {
@ -602,8 +604,10 @@ void NetStartAgain(void)
retrycnt = 1;
else
retrycnt = simple_strtoul(nretry, NULL, 0);
} else
retry_forever = 1;
} else {
retrycnt = 0;
retry_forever = 0;
}
if ((!retry_forever) && (NetTryCount >= retrycnt)) {
eth_halt();