diff options
| author | Tom Cosgrove <tom@cvs.openbsd.org> | 2005-03-13 22:31:50 +0000 |
|---|---|---|
| committer | Tom Cosgrove <tom@cvs.openbsd.org> | 2005-03-13 22:31:50 +0000 |
| commit | 1bb479f2b1ffc27015c4db7049d5a2e2364c11e2 (patch) | |
| tree | 253308e67d618416dafdf7246991a8e1ad145082 /sys/arch | |
| parent | 516ad576f90ca49285b52fa6fb822a4f917e3adc (diff) | |
Only use bangpxe calling on PXE 2.1 and above. Makes no difference on
current-spec PXE systems, but should allow some older ones to get a bit
further.
Diff from krw@. Tested by krw@ on several PXE 2.1 cards. Many thanks.
ok krw@; "get these changes into the amd64" deraadt@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/stand/libsa/pxe.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/pxeboot/conf.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/stand/libsa/pxe.c b/sys/arch/amd64/stand/libsa/pxe.c index ef94619e2ad..c11b3a00086 100644 --- a/sys/arch/amd64/stand/libsa/pxe.c +++ b/sys/arch/amd64/stand/libsa/pxe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxe.c,v 1.2 2005/03/13 22:21:26 tom Exp $ */ +/* $OpenBSD: pxe.c,v 1.3 2005/03/13 22:31:49 tom Exp $ */ /* $NetBSD: pxe.c,v 1.5 2003/03/11 18:29:00 drochner Exp $ */ /* @@ -399,7 +399,7 @@ pxe_init(int quiet) } } - if (pxe != NULL) { + if (pxenv == NULL) { pxe_call = pxecall_bangpxe; bangpxe_off = pxe->EntryPointSP.offset; bangpxe_seg = pxe->EntryPointSP.segment; diff --git a/sys/arch/amd64/stand/pxeboot/conf.c b/sys/arch/amd64/stand/pxeboot/conf.c index ed9fdd6852e..57d0cc441fb 100644 --- a/sys/arch/amd64/stand/pxeboot/conf.c +++ b/sys/arch/amd64/stand/pxeboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.2 2005/03/13 22:14:54 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.3 2005/03/13 22:31:49 tom Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -45,7 +45,7 @@ #include "pxeboot.h" #include "pxe_net.h" -const char version[] = "1.01"; +const char version[] = "1.02"; int debug = 0; #undef _TEST |