From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eOfFc-0001PU-Cr for barebox@lists.infradead.org; Tue, 12 Dec 2017 07:45:18 +0000 Date: Tue, 12 Dec 2017 08:44:54 +0100 From: Sascha Hauer Message-ID: <20171212074454.knxtnqh5qg5zrkqb@pengutronix.de> References: <20171209093144.21281-1-linux@rempel-privat.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20171209093144.21281-1-linux@rempel-privat.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] net: dhcp: make tftp work again To: Oleksij Rempel Cc: barebox@lists.infradead.org On Sat, Dec 09, 2017 at 10:31:44AM +0100, Oleksij Rempel wrote: > This regression was introduced by the patch "net: dhcp: rework" > My patch should restore previous behavior where tftp server name > will overwrite serverip if the first one is present. > > On most consumer devices users don't have enough control to set > DHCP as needed. At least on LEDE/OpenWRT we can configure extra > fields by adding for example "66,192.168.1.100" to set tftp server name. > At the same time, DHCP, DNS and Gateware are provided by 192.168.1.1. > > Signed-off-by: Oleksij Rempel Squashed into the original commit, thanks for fixing. Sascha > --- > net/dhcp.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/net/dhcp.c b/net/dhcp.c > index 76dab5ef5..18f347d2f 100644 > --- a/net/dhcp.c > +++ b/net/dhcp.c > @@ -574,14 +574,14 @@ int dhcp_set_result(struct eth_device *edev, struct dhcp_result *res) > if (res->domainname) > net_set_domainname(res->domainname); > > - if (res->serverip) { > - net_set_serverip_empty(res->serverip); > - } else if (res->tftp_server_name) { > + if (res->tftp_server_name) { > IPaddr_t ip; > > ip = resolv(res->tftp_server_name); > if (ip) > net_set_serverip_empty(ip); > + } else if (res->serverip) { > + net_set_serverip_empty(res->serverip); > } > > return 0; > -- > 2.14.1 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox