[hacks] Improve the guess_boot_netdev() logic

This function is a major kludge, but can be made slightly more accurate by ignoring net devices that aren't open. Eventually it needs to be removed entirely.
ipxe · Oct 31, 2008 · 467c4f7 · 467c4f7
1 parent 0a6c66a
commit 467c4f7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/arch/i386/image/nbi.c b/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;

diff --git a/src/usr/aoeboot.c b/src/usr/aoeboot.c
@@ -16,11 +16,12 @@
  * @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;

diff --git a/src/usr/iscsiboot.c b/src/usr/iscsiboot.c
@@ -26,11 +26,12 @@ struct setting keep_san_setting __setting = {
  * @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;