From: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Date: Sun, 30 Aug 2015 15:47:17 +0000 (+0200)
Subject: net: cancel timeout handler after DHCPACK
X-Git-Tag: v2016.01-rc1~154^2~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4f28c9b169eb3dfa0981f58f9c649a03be39fda0;p=oweals%2Fu-boot.git

net: cancel timeout handler after DHCPACK

Timeout handler should be stopped after reception of DHCPACK. If "autoload"
is not set, the handler is immediately replaced by the TFTP handler,
otherwise it may trigger before the next boot stage begins.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/net/bootp.c b/net/bootp.c
index 1316f00dd8..5d1edf1dcb 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -1018,6 +1018,7 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
 			dhcp_state = BOUND;
 			printf("DHCP client bound to address %pI4 (%lu ms)\n",
 			       &net_ip, get_timer(bootp_start));
+			net_set_timeout_handler(0, (thand_f *)0);
 			bootstage_mark_name(BOOTSTAGE_ID_BOOTP_STOP,
 					    "bootp_stop");