From ae0124cd404c0ee25152bef70bee9e2030054ce7 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 27 Aug 2013 16:28:54 +0100 Subject: [linux] Give tap devices a name and bus type Give tap devices a meaningful name, and avoid segmentation faults when attempting to retrieve ${net0/bustype} by assigning a new bus type for tap devices. Signed-off-by: Michael Brown --- src/net/netdev_settings.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/net') diff --git a/src/net/netdev_settings.c b/src/net/netdev_settings.c index 52e8007dd..994e0506f 100644 --- a/src/net/netdev_settings.c +++ b/src/net/netdev_settings.c @@ -120,6 +120,7 @@ static int netdev_fetch_bustype ( struct net_device *netdev, void *data, [BUS_TYPE_EISA] = "EISA", [BUS_TYPE_MCA] = "MCA", [BUS_TYPE_ISA] = "ISA", + [BUS_TYPE_TAP] = "TAP", }; struct device_description *desc = &netdev->dev->desc; const char *bustype; @@ -127,7 +128,7 @@ static int netdev_fetch_bustype ( struct net_device *netdev, void *data, assert ( desc->bus_type < ( sizeof ( bustypes ) / sizeof ( bustypes[0] ) ) ); bustype = bustypes[desc->bus_type]; - assert ( bustypes != NULL ); + assert ( bustype != NULL ); strncpy ( data, bustype, len ); return strlen ( bustype ); } -- cgit v1.2.3-55-g7522