summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-07-20 08:55:38 +0200
committerWolfgang Denk <wd@denx.de>2012-07-20 08:55:38 +0200
commit062cf36f674db38d1ce27addfdcb5b3a6160b362 (patch)
tree2a7755ac48bea29197fde15e462dd3569688f991
parent4f7136e7c55e95aa3a5c6b99f9ef9f32c906612c (diff)
parentb6841157912b47a929e6ebc8d8385bef1cdb68fe (diff)
downloadu-boot-imx-062cf36f674db38d1ce27addfdcb5b3a6160b362.zip
u-boot-imx-062cf36f674db38d1ce27addfdcb5b3a6160b362.tar.gz
u-boot-imx-062cf36f674db38d1ce27addfdcb5b3a6160b362.tar.bz2
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>
-rw-r--r--net/bootp.c2
-rw-r--r--net/link_local.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/net/bootp.c b/net/bootp.c
index 87e30ab..c9b8349 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -330,7 +330,7 @@ BootpTimeout(void)
if (BootpTry >= TIMEOUT_COUNT) {
#ifdef CONFIG_BOOTP_MAY_FAIL
puts("\nRetry count exceeded\n");
- NetSetState(NETLOOP_FAIL);
+ net_set_state(NETLOOP_FAIL);
#else
puts("\nRetry count exceeded; starting again\n");
NetStartAgain();
diff --git a/net/link_local.c b/net/link_local.c
index 8e7665f..d52f13a 100644
--- a/net/link_local.c
+++ b/net/link_local.c
@@ -225,8 +225,8 @@ void link_local_receive_arp(struct arp_hdr *arp, int len)
timeout_ms = diff | 1; /* never 0 */
}
}
-/*
- * XXX Don't bother with ethernet link just yet
+#if 0
+ /* XXX Don't bother with ethernet link just yet */
if ((fds[0].revents & POLLIN) == 0) {
if (fds[0].revents & POLLERR) {
/*
@@ -240,7 +240,7 @@ void link_local_receive_arp(struct arp_hdr *arp, int len)
}
continue;
}
-*/
+#endif
debug_cond(DEBUG_INT_STATE, "%s recv arp type=%d, op=%d,\n",
eth_get_name(), ntohs(arp->ar_pro),