From 2ed2237d701743a0e7c5bf39b51fbf8295fb557f Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Fri, 24 Apr 2009 15:01:53 -0700 Subject: [PATCH] pxelinux: fix minor bugs Fix minor bugs reported by pfranz73@tiscali.it. Signed-off-by: H. Peter Anvin --- core/pxelinux.asm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/pxelinux.asm b/core/pxelinux.asm index b9ef963..3a73e10 100644 --- a/core/pxelinux.asm +++ b/core/pxelinux.asm @@ -220,7 +220,7 @@ UUIDNull resb 1 ; dhcp_copyoption zero-terminates alignb 4 pxe_unload_stack_pkt: .status: resw 1 ; Status -.reserved: resw 10 ; Reserved +.reserved: resb 10 ; Reserved pxe_unload_stack_pkt_len equ $-pxe_unload_stack_pkt alignb 16 @@ -455,7 +455,7 @@ have_entrypoint: cmp ax,dx ja .data_on_top - xchg ax,ax + xchg ax,dx .data_on_top: ; Could we safely add 63 here before the shift? shr ax,6 ; Convert to kilobytes @@ -2214,8 +2214,6 @@ pxe_get_cached_info: mov bx,PXENV_GET_CACHED_INFO call pxenv jc .err - and ax,ax - jnz .err popad mov cx,[pxe_bootp_query_pkt.buffersize] -- 2.7.4