Quellcode durchsuchen

[netdevice] Avoid using zero as a network device index

Avoid using zero as a network device index, so that a zero
sin6_scope_id can be used to mean "unspecified" (rather than
unintentionally meaning "net0").

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown vor 9 Jahren
Ursprung
Commit
9c185e2eac
1 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
  1. 2
    2
      src/net/netdevice.c

+ 2
- 2
src/net/netdevice.c Datei anzeigen

@@ -676,11 +676,11 @@ int register_netdev ( struct net_device *netdev ) {
676 676
 	}
677 677
 
678 678
 	/* Record device index and create device name */
679
-	netdev->index = netdev_index++;
680 679
 	if ( netdev->name[0] == '\0' ) {
681 680
 		snprintf ( netdev->name, sizeof ( netdev->name ), "net%d",
682
-			   netdev->index );
681
+			   netdev_index );
683 682
 	}
683
+	netdev->index = ++netdev_index;
684 684
 
685 685
 	/* Use least significant bits of the link-layer address to
686 686
 	 * improve the randomness of the (non-cryptographic) random

Laden…
Abbrechen
Speichern