aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2005-08-28 06:00:54 +0000
committerhpa <hpa>2005-08-28 06:00:54 +0000
commite0c7f8a022138a4d52a2ae64c5e990a2f4f436d5 (patch)
tree14ca666094842ba4cfd68bbef4dfe6012d6e5108
parent68faab1542a6ddc04a77aba2e60318caca127b8b (diff)
downloadsyslinux-elf-e0c7f8a022138a4d52a2ae64c5e990a2f4f436d5.tar.gz
syslinux-elf-e0c7f8a022138a4d52a2ae64c5e990a2f4f436d5.tar.xz
syslinux-elf-e0c7f8a022138a4d52a2ae64c5e990a2f4f436d5.zip
Revert USE_PXE_PROVIDED_STACK change.
-rw-r--r--NEWS2
-rw-r--r--pxelinux.asm9
2 files changed, 10 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index c5fe010b..45037ed9 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@ Changes in 3.11:
* Simple menu system: allow tweaking of the screen layout.
* Simple menu system: better command-line editing, correctly
handle command lines above 256 characters.
+ * PXELINUX: revert memory allocation change that caused
+ problems on some network cards.
Changes in 3.10:
* gcc 4.0.1 compilation fixes.
diff --git a/pxelinux.asm b/pxelinux.asm
index f2b542b2..9ff832c3 100644
--- a/pxelinux.asm
+++ b/pxelinux.asm
@@ -52,7 +52,7 @@ TFTP_LARGEBLK equ (TFTP_MTU-20-8-4) ; MTU - IP hdr - UDP hdr - TFTP hdr
; Standard TFTP block size
TFTP_BLOCKSIZE_LG2 equ 9 ; log2(bytes/block)
TFTP_BLOCKSIZE equ (1 << TFTP_BLOCKSIZE_LG2)
-%assign USE_PXE_PROVIDED_STACK 0 ; Use stack provided by PXE?
+%assign USE_PXE_PROVIDED_STACK 1 ; Use stack provided by PXE?
SECTOR_SHIFT equ TFTP_BLOCKSIZE_LG2
SECTOR_SIZE equ TFTP_BLOCKSIZE
@@ -357,7 +357,14 @@ _start1:
; Uh-oh, not there... try plan B
mov ax, 5650h
+%if USE_PXE_PROVIDED_STACK == 0
+ lss sp,[InitStack]
+%endif
int 1Ah ; May trash regs
+%if USE_PXE_PROVIDED_STACK == 0
+ lss esp,[BaseStack]
+%endif
+
jc no_pxe
cmp ax,564Eh
jne no_pxe