From b977aa80b5e4d9dc6ea447e6a82dfd1492baf889 Mon Sep 17 00:00:00 2001 From: "benoit.thebaudeau@advans" Date: Thu, 19 Jul 2012 01:23:21 +0000 Subject: [PATCH 1/2] net: bootp: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix NetSetState function name used with CONFIG_BOOTP_MAY_FAIL. Signed-off-by: Benoît Thébaudeau Cc: Joe Hershberger --- net/bootp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bootp.c b/net/bootp.c index 87e30ab8e0..c9b8349b36 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(); From b6841157912b47a929e6ebc8d8385bef1cdb68fe Mon Sep 17 00:00:00 2001 From: "benoit.thebaudeau@advans" Date: Thu, 19 Jul 2012 01:19:34 +0000 Subject: [PATCH 2/2] net: link_local: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix comment within comment build error. Signed-off-by: Benoît Thébaudeau Cc: Joe Hershberger --- net/link_local.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/link_local.c b/net/link_local.c index 8e7665f090..d52f13adb4 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),