From 9c185e2eac39561c2e9847c355c5b710c3e557b5 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 21 Jul 2015 14:51:16 +0100 Subject: [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 --- src/net/netdevice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/net/netdevice.c b/src/net/netdevice.c index 889b00c..7c40a2a 100644 --- a/src/net/netdevice.c +++ b/src/net/netdevice.c @@ -676,11 +676,11 @@ int register_netdev ( struct net_device *netdev ) { } /* Record device index and create device name */ - netdev->index = netdev_index++; if ( netdev->name[0] == '\0' ) { snprintf ( netdev->name, sizeof ( netdev->name ), "net%d", - netdev->index ); + netdev_index ); } + netdev->index = ++netdev_index; /* Use least significant bits of the link-layer address to * improve the randomness of the (non-cryptographic) random -- cgit v1.1