2002-05-08 Yoshinori K. Okuji <okuji@enbug.org>

	* netboot/etherboot.h (ETH_MAX_MTU): Because some DHCP/BOOTP
	servers don't treat the maximum length the same as Etherboot,
	subtract the size of an IP header and that of an UDP header.

diff --git a/ChangeLog b/ChangeLog
index f4716b4d837aef74faf2c1160ae500f5859b1313..0573d7251da758370d7d9243ceb5b0c583dfea5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-08  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * netboot/etherboot.h (ETH_MAX_MTU): Because some DHCP/BOOTP
+       servers don't treat the maximum length the same as Etherboot,
+       subtract the size of an IP header and that of an UDP header.
+       
 2002-04-30  Yoshinori K. Okuji  <okuji@enbug.org>
 
        From Jean-Jacques Michel <jjmichel@linbox.com>:

diff --git a/docs/grub-install.8 b/docs/grub-install.8
index d8c8b26df6f995c1eca57cb591813ab258ede455..7b59d5e391a173750135760210eea48cda4417ec 100644 (file)
--- a/docs/grub-install.8
+++ b/docs/grub-install.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-INSTALL "8" "April 2002" "grub-install (GNU GRUB 0.92)" FSF
+.TH GRUB-INSTALL "8" "May 2002" "grub-install (GNU GRUB 0.92)" FSF
 .SH NAME
 grub-install \- install GRUB on your drive
 .SH SYNOPSIS

diff --git a/docs/grub-md5-crypt.8 b/docs/grub-md5-crypt.8
index 13699211a987331c9e9d1c8e4bd34e85de25c6c4..fc03ca03acc00543db41f611a9ad92a521640107 100644 (file)
--- a/docs/grub-md5-crypt.8
+++ b/docs/grub-md5-crypt.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-MD5-CRYPT "8" "April 2002" "grub-md5-crypt (GNU GRUB )" FSF
+.TH GRUB-MD5-CRYPT "8" "May 2002" "grub-md5-crypt (GNU GRUB )" FSF
 .SH NAME
 grub-md5-crypt \- Encrypt a password in MD5 format
 .SH SYNOPSIS

diff --git a/docs/grub.8 b/docs/grub.8
index 3c4c53dccd23cadddaeea934a7e39de6e314c7fd..eab30efc26f915dd72ce3654b87ae2cc63010cc3 100644 (file)
--- a/docs/grub.8
+++ b/docs/grub.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB "8" "April 2002" "grub (GNU GRUB 0.92)" FSF
+.TH GRUB "8" "May 2002" "grub (GNU GRUB 0.92)" FSF
 .SH NAME
 grub \- the grub shell
 .SH SYNOPSIS

diff --git a/docs/mbchk.1 b/docs/mbchk.1
index 21d367d9350b86063f311279f46da0355b21daa4..d0c1e0fb25c7817a737aef401e33d0afe99a9bb2 100644 (file)
--- a/docs/mbchk.1
+++ b/docs/mbchk.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH MBCHK "1" "April 2002" "mbchk (GNU GRUB 0.92)" FSF
+.TH MBCHK "1" "May 2002" "mbchk (GNU GRUB 0.92)" FSF
 .SH NAME
 mbchk \- check the format of a Multiboot kernel
 .SH SYNOPSIS

diff --git a/netboot/etherboot.h b/netboot/etherboot.h
index af27673c314f3bd148e35cc7cf877f54cef83186..f0c35f1d0014bb62b5b2b6e51302f905f00cd2e7 100644 (file)
--- a/netboot/etherboot.h
+++ b/netboot/etherboot.h
@@ -98,7 +98,12 @@ Author: Martin Renters
 /*#define ETH_MIN_PACKET               64*/
 #define        ETH_FRAME_LEN           1514    /* Maximum packet */
 /*#define ETH_MAX_PACKET               1518*/
-#define        ETH_MAX_MTU             (ETH_FRAME_LEN - ETH_HLEN)
+/* Because some DHCP/BOOTP servers don't treat the maximum length the same
+   as Etherboot, subtract the size of an IP header and that of an UDP
+   header.  */
+#define        ETH_MAX_MTU             (ETH_FRAME_LEN - ETH_HLEN \
+                               - sizeof (struct iphdr) \
+                               - sizeof (struct udphdr))
 
 #define ARP_CLIENT     0
 #define ARP_SERVER     1