From 4e3d2f5a8541a5c5a22c8295c89c7d20352cbaf1 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 9 Mar 2018 15:48:24 +0100 Subject: [PATCH] platform/linux: recognize WPAN links --- src/nm-types.h | 3 ++- src/platform/nm-linux-platform.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/nm-types.h b/src/nm-types.h index 1477d2269..5eee83fa5 100644 --- a/src/nm-types.h +++ b/src/nm-types.h @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2012 - 2017 Red Hat, Inc. + * Copyright (C) 2012 - 2018 Red Hat, Inc. */ #ifndef __NETWORKMANAGER_TYPES_H__ @@ -150,6 +150,7 @@ typedef enum { NM_LINK_TYPE_WIFI, NM_LINK_TYPE_WWAN_NET, /* WWAN kernel netdevice */ NM_LINK_TYPE_WIMAX, + NM_LINK_TYPE_WPAN, /* Software types */ NM_LINK_TYPE_BNEP = 0x10000, /* Bluetooth Ethernet emulation */ diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 56f2cee59..d3c2b9767 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -534,6 +534,7 @@ static const LinkDesc linktypes[] = { { NM_LINK_TYPE_WIFI, "wifi", NULL, "wlan" }, { NM_LINK_TYPE_WWAN_NET, "wwan", NULL, "wwan" }, { NM_LINK_TYPE_WIMAX, "wimax", "wimax", "wimax" }, + { NM_LINK_TYPE_WPAN, "wpan", NULL, NULL }, { NM_LINK_TYPE_BNEP, "bluetooth", NULL, "bluetooth" }, { NM_LINK_TYPE_DUMMY, "dummy", "dummy", NULL }, @@ -842,6 +843,8 @@ _linktype_get_type (NMPlatform *platform, return NM_LINK_TYPE_IP6TNL; else if (arptype == ARPHRD_PPP) return NM_LINK_TYPE_PPP; + else if (arptype == ARPHRD_IEEE802154) + return NM_LINK_TYPE_WPAN; { NMPUtilsEthtoolDriverInfo driver_info;