aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2004-12-17 07:57:32 +0000
committerhpa <hpa>2004-12-17 07:57:32 +0000
commit89d4a08e6df3062b3aaf302c3f41e54150aaced0 (patch)
tree2ec1e83cc4975a3091b419b3fec71c5f324a128f
parent49378a236262c352087afc5df91007aa769a9fda (diff)
downloadsyslinux.git-89d4a08e6df3062b3aaf302c3f41e54150aaced0.tar.gz
syslinux.git-89d4a08e6df3062b3aaf302c3f41e54150aaced0.tar.xz
syslinux.git-89d4a08e6df3062b3aaf302c3f41e54150aaced0.zip
Fix the use of MAC handling in pxelinux; fix copy_over_selfsyslinux-2.20-pre4
-rw-r--r--bcopy32.inc4
-rw-r--r--pxelinux.asm8
2 files changed, 7 insertions, 5 deletions
diff --git a/bcopy32.inc b/bcopy32.inc
index ae4f8d0e..3bd2ca9f 100644
--- a/bcopy32.inc
+++ b/bcopy32.inc
@@ -1,7 +1,7 @@
;; $Id$
;; -----------------------------------------------------------------------
;;
-;; Copyright 1994-2002 H. Peter Anvin - All Rights Reserved
+;; Copyright 1994-2004 H. Peter Anvin - All Rights Reserved
;;
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -393,7 +393,7 @@ try_wbinvd:
; ESI, EDI, ECX - same as bcopy
; On stack - initial state (fd, ad, ds, es, fs, gs)
;
-%define ADJUST (__bcopy_start - $$) - BSS_START
+ADJUST equ (__bcopy_start - $$) + 7C00h - BSS_START
align 2
adjlist dw bcopy_gdt.adj1 - ADJUST
diff --git a/pxelinux.asm b/pxelinux.asm
index 1ae05d79..4b1c6b1b 100644
--- a/pxelinux.asm
+++ b/pxelinux.asm
@@ -209,8 +209,6 @@ ConfigName resb 256 ; Configuration file from DHCP option
PathPrefix resb 256 ; Path prefix derived from boot file
DotQuadBuf resb 16 ; Buffer for dotted-quad IP address
IPOption resb 80 ; ip= option buffer
-MAC resb 16 ; Actual MAC address
-MACStr resb 3*17 ; MAC address as a string
alignb 4
InitStack resd 1 ; Pointer to reset stack
RebootTime resd 1 ; Reboot timeout, if set by option
@@ -221,9 +219,13 @@ IdleTimer resw 1 ; Time to check for ARP?
LocalBootType resw 1 ; Local boot return code
PktTimeout resw 1 ; Timeout for current packet
RealBaseMem resw 1 ; Amount of DOS memory after freeing
+OverLoad resb 1 ; Set if DHCP packet uses "overloading"
+
+; The relative position of these fields matter!
MACLen resb 1 ; MAC address len
MACType resb 1 ; MAC address type
-OverLoad resb 1 ; Set if DHCP packet uses "overloading"
+MAC resb 16 ; Actual MAC address
+MACStr resb 3*17 ; MAC address as a string
;
; PXE packets which don't need static initialization