summaryrefslogtreecommitdiff
path: root/gpxe/src/arch/i386/image/nbi.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-12-12 14:36:02 -0800
committerH. Peter Anvin <hpa@zytor.com>2008-12-14 13:56:44 -0800
commite2ab9215d792d07cfb725de290f416e331b87627 (patch)
tree7fbf2b3f921ef78b277f5d89c1a9a14960a49edc /gpxe/src/arch/i386/image/nbi.c
parent36390f9712ac56be1dce7a635322bd96e15620c1 (diff)
downloadsyslinux-e2ab9215d792d07cfb725de290f416e331b87627.tar.gz
gPXE: update to the "kkpxe" branchkkpxe
Update gPXE to the "kkpxe" branch, an experimental branch of the gPXE tree which should let us eliminate the gpxelinux-specific hacks. Specifically, this corresponds to checkin 0963c883a9402bd5846e687a100e196f7e8a2ef7 of git://git.etherboot.org/scm/people/mcb30/gpxe.git. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'gpxe/src/arch/i386/image/nbi.c')
-rw-r--r--gpxe/src/arch/i386/image/nbi.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gpxe/src/arch/i386/image/nbi.c b/gpxe/src/arch/i386/image/nbi.c
index e6a0ab0f..ea8375cb 100644
--- a/gpxe/src/arch/i386/image/nbi.c
+++ b/gpxe/src/arch/i386/image/nbi.c
@@ -372,11 +372,12 @@ static int nbi_boot32 ( struct image *image, struct imgheader *imgheader ) {
* @ret netdev Boot network device
*/
static struct net_device * guess_boot_netdev ( void ) {
- struct net_device *boot_netdev;
+ struct net_device *netdev;
/* Just use the first network device */
- for_each_netdev ( boot_netdev ) {
- return boot_netdev;
+ for_each_netdev ( netdev ) {
+ if ( netdev->state & NETDEV_OPEN )
+ return netdev;
}
return NULL;