Revert USE_PXE_PROVIDED_STACK change.

diff --git a/NEWS b/NEWS
index c5fe010..45037ed 100644 (file)
--- 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 f2b542b..9ff832c 100644 (file)
--- 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