summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/bootp.c2
-rw-r--r--net/link_local.c6
-rw-r--r--net/net.c3
3 files changed, 5 insertions, 6 deletions
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();
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),
diff --git a/net/net.c b/net/net.c
index 9de7d92643..e8ff0662b8 100644
--- a/net/net.c
+++ b/net/net.c
@@ -256,6 +256,7 @@ static void NetInitLoop(void)
#endif
env_changed_id = env_id;
}
+ memcpy(NetOurEther, eth_get_dev()->enetaddr, 6);
return;
}
@@ -322,8 +323,6 @@ int NetLoop(enum proto_t protocol)
}
restart:
- memcpy(NetOurEther, eth_get_dev()->enetaddr, 6);
-
net_set_state(NETLOOP_CONTINUE);
/*
OpenPOWER on IntegriCloud