Re: Bug in etherboot/src/core/nic.c

On Tue, May 31, 2005 at 11:11:36AM +0200, Helge Wagner wrote:
> I just found a bug in the file "etherboot/src/core/nic.c".
> This only takes places if you compile for BOOTP ("NO_DHCP_SUPPORT" is
> defined).
> Without my change, the compiler will find an undefined symbol ("timeout").
> Here is the diff file for etherboot 5.4.0 (i just looked at the latest nic.c
> and it still contains the bug):
> 

  <snip> context diff  ( hard to read output of diff -c )  </snip>
 

The same patch as unified diff.


Index: etherboot-5.4/src/core/nic.c
===================================================================
RCS file: /cvsroot/etherboot/etherboot/etherboot-5.4/src/core/nic.c,v
retrieving revision 1.1
diff -u -r1.1 nic.c
--- etherboot-5.4/src/core/nic.c	4 Apr 2005 22:36:21 -0000	1.1
+++ etherboot-5.4/src/core/nic.c	31 May 2005 10:01:17 -0000
@@ -967,7 +967,7 @@
 		remaining_time = rfc2131_sleep_interval(BOOTP_TIMEOUT, retry++);
 		stop_time = currticks() + remaining_time;
 #ifdef	NO_DHCP_SUPPORT
-		if (await_reply(await_bootp, 0, NULL, timeout))
+		if (await_reply(await_bootp, 0, NULL, remaining_time))
 			return(1);
 #else
 		while ( remaining_time > 0 ) {


AFAICT it seems okay to commit into the VCS.
But what should go into the LOG file?


Cheers
Geert Stappers

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFCnDhIOSINbgwa/7sRAoVrAJwNkbsg+JFpCL7gkGXbCrI9PkzU8gCfeipJ
BZgcyViedoKhwN/YfwqJNiE=
=ECah
-----END PGP SIGNATURE-----