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: NWolfgang Denk <wd@denx.de>

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();

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),