diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:55:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:55:04 +0100 |
| commit | b2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d (patch) | |
| tree | c7bf18bd3f6eef491dd62d383f836e4536c811cb /net | |
| parent | ac9c1beb361e3c71e0b9b59d38e5022f12c263c6 (diff) | |
| parent | 459bf1fd31da2c091c6c1e3a7e0f6a1b1cbf588b (diff) | |
| download | barebox-b2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d.tar.gz barebox-b2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'net')
| -rw-r--r-- | net/dhcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dhcp.c b/net/dhcp.c index 427d80a5a8..79aa75d878 100644 --- a/net/dhcp.c +++ b/net/dhcp.c @@ -300,7 +300,7 @@ static void dhcp_options_handle(unsigned char option, void *popt, net_copy_uint32(&dhcp_result->leasetime, popt); break; case 54: - dhcp_result->serverip = net_read_ip(popt); + dhcp_result->dhcp_serverip = net_read_ip(popt); break; case 66: dhcp_result->tftp_server_name = xstrndup(popt, optlen); @@ -378,8 +378,8 @@ static void dhcp_send_request_packet(struct bootp *bp_offer) /* * Copy options from OFFER packet if present */ - extlen = dhcp_extended(bp->bp_vend, DHCP_REQUEST, dhcp_result->serverip, - dhcp_result->ip); + extlen = dhcp_extended(bp->bp_vend, DHCP_REQUEST, + dhcp_result->dhcp_serverip, dhcp_result->ip); debug("Transmitting DHCPREQUEST packet\n"); net_udp_send(dhcp_con, sizeof(*bp) + extlen); |