sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'pu/dhcp'

This commit is contained in:
Sascha Hauer 2013-05-17 07:41:49 +02:00
parent b9ac45694f 66691793b0
commit 8fae46a207
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/dhcp.c
View File

@ -527,9 +527,6 @@ static void dhcp_options_process(unsigned char *popt, struct bootp *bp)
popt += oplen + 2; /* Process next option */
}
if (dhcp_tftpname[0] != 0)
net_set_serverip(resolv(dhcp_tftpname));
}
static int dhcp_message_type(unsigned char *popt)
@ -767,8 +764,10 @@ static int do_dhcp(int argc, char *argv[])
goto out1;
while (dhcp_state != BOUND) {
if (ctrlc())
break;
if (ctrlc()) {
ret = -EINTR;
goto out1;
}
if (!retries) {
ret = -ETIMEDOUT;
goto out1;
@ -785,6 +784,12 @@ static int do_dhcp(int argc, char *argv[])
}
}
if (dhcp_tftpname[0] != 0) {
IPaddr_t tftpserver = resolv(dhcp_tftpname);
if (tftpserver)
net_set_serverip(tftpserver);
}
out1:
net_unregister(dhcp_con);
out: