D10953.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D10953.diff
View Options

	Index: head/sys/boot/common/dev_net.c
	===================================================================
	--- head/sys/boot/common/dev_net.c
	+++ head/sys/boot/common/dev_net.c
	@@ -256,7 +256,6 @@
	{
	char buf[MAXHOSTNAMELEN];
	n_long rootaddr, smask;
	- struct iodesc *d = socktodesc(sock);
	extern struct in_addr servip;

	#ifdef SUPPORT_BOOTP
	@@ -266,26 +265,8 @@
	* 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