mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-08-11 04:33:46 +09:00
Merge branch 'master' of git://git.denx.de/u-boot-net
* 'master' of git://git.denx.de/u-boot-net: net: link_local: fix build net: bootp: fix build Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
commit
062cf36f67
@ -330,7 +330,7 @@ BootpTimeout(void)
|
|||||||
if (BootpTry >= TIMEOUT_COUNT) {
|
if (BootpTry >= TIMEOUT_COUNT) {
|
||||||
#ifdef CONFIG_BOOTP_MAY_FAIL
|
#ifdef CONFIG_BOOTP_MAY_FAIL
|
||||||
puts("\nRetry count exceeded\n");
|
puts("\nRetry count exceeded\n");
|
||||||
NetSetState(NETLOOP_FAIL);
|
net_set_state(NETLOOP_FAIL);
|
||||||
#else
|
#else
|
||||||
puts("\nRetry count exceeded; starting again\n");
|
puts("\nRetry count exceeded; starting again\n");
|
||||||
NetStartAgain();
|
NetStartAgain();
|
||||||
|
@ -225,8 +225,8 @@ void link_local_receive_arp(struct arp_hdr *arp, int len)
|
|||||||
timeout_ms = diff | 1; /* never 0 */
|
timeout_ms = diff | 1; /* never 0 */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/*
|
#if 0
|
||||||
* XXX Don't bother with ethernet link just yet
|
/* XXX Don't bother with ethernet link just yet */
|
||||||
if ((fds[0].revents & POLLIN) == 0) {
|
if ((fds[0].revents & POLLIN) == 0) {
|
||||||
if (fds[0].revents & POLLERR) {
|
if (fds[0].revents & POLLERR) {
|
||||||
/*
|
/*
|
||||||
@ -240,7 +240,7 @@ void link_local_receive_arp(struct arp_hdr *arp, int len)
|
|||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
*/
|
#endif
|
||||||
|
|
||||||
debug_cond(DEBUG_INT_STATE, "%s recv arp type=%d, op=%d,\n",
|
debug_cond(DEBUG_INT_STATE, "%s recv arp type=%d, op=%d,\n",
|
||||||
eth_get_name(), ntohs(arp->ar_pro),
|
eth_get_name(), ntohs(arp->ar_pro),
|
||||||
|
Loading…
Reference in New Issue
Block a user