diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-05-27 12:46:46 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-05-27 12:46:46 +0000 |
| commit | e9ce925773238af81c95c2caa64162edde167a02 (patch) | |
| tree | cc6dd8c0276e3a2d9360d841725bcd93960d617c | |
| parent | 4dfd16670e09d5d54d5c1b41776bb9aa0b8fab33 (diff) | |
Notes
| -rw-r--r-- | sys/boot/common/dev_net.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/sys/boot/common/dev_net.c b/sys/boot/common/dev_net.c index 96e588a9924c6..d26be7d05321c 100644 --- a/sys/boot/common/dev_net.c +++ b/sys/boot/common/dev_net.c @@ -256,7 +256,6 @@ net_getparams(int sock) { char buf[MAXHOSTNAMELEN]; n_long rootaddr, smask; - struct iodesc *d = socktodesc(sock); extern struct in_addr servip; #ifdef SUPPORT_BOOTP @@ -266,26 +265,8 @@ net_getparams(int sock) * be initialized. If any remain uninitialized, we will * use RARP and RPC/bootparam (the Sun way) to get them. */ - if (try_bootp) { - int rc = -1; - if (bootp_response != NULL) { - rc = dhcp_try_rfc1048(bootp_response->bp_vend, - bootp_response_size - - offsetof(struct bootp, bp_vend)); - - if (servip.s_addr == 0) - servip = bootp_response->bp_siaddr; - if (rootip.s_addr == 0) - rootip = bootp_response->bp_siaddr; - if (gateip.s_addr == 0) - gateip = bootp_response->bp_giaddr; - if (myip.s_addr == 0) - myip = bootp_response->bp_yiaddr; - d->myip = myip; - } - if (rc < 0) - bootp(sock); - } + if (try_bootp) + bootp(sock); if (myip.s_addr != 0) goto exit; #ifdef NETIF_DEBUG |