colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/linux: recognize WPAN links

Browse Source
This commit is contained in:
Lubomir Rintel
2018-03-09 15:48:24 +01:00
parent dbb205d8d2
commit 4e3d2f5a85
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nm-types.h
View File

@@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 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__ #ifndef __NETWORKMANAGER_TYPES_H__
@@ -150,6 +150,7 @@ typedef enum {
NM_LINK_TYPE_WIFI, NM_LINK_TYPE_WIFI,
NM_LINK_TYPE_WWAN_NET, /* WWAN kernel netdevice */ NM_LINK_TYPE_WWAN_NET, /* WWAN kernel netdevice */
NM_LINK_TYPE_WIMAX, NM_LINK_TYPE_WIMAX,
NM_LINK_TYPE_WPAN,
/* Software types */ /* Software types */
NM_LINK_TYPE_BNEP = 0x10000, /* Bluetooth Ethernet emulation */ NM_LINK_TYPE_BNEP = 0x10000, /* Bluetooth Ethernet emulation */

3
src/platform/nm-linux-platform.c
View File

@@ -534,6 +534,7 @@ static const LinkDesc linktypes[] = {
{ NM_LINK_TYPE_WIFI, "wifi", NULL, "wlan" }, { NM_LINK_TYPE_WIFI, "wifi", NULL, "wlan" },
{ NM_LINK_TYPE_WWAN_NET, "wwan", NULL, "wwan" }, { NM_LINK_TYPE_WWAN_NET, "wwan", NULL, "wwan" },
{ NM_LINK_TYPE_WIMAX, "wimax", "wimax", "wimax" }, { NM_LINK_TYPE_WIMAX, "wimax", "wimax", "wimax" },
{ NM_LINK_TYPE_WPAN, "wpan", NULL, NULL },
{ NM_LINK_TYPE_BNEP, "bluetooth", NULL, "bluetooth" }, { NM_LINK_TYPE_BNEP, "bluetooth", NULL, "bluetooth" },
{ NM_LINK_TYPE_DUMMY, "dummy", "dummy", NULL }, { NM_LINK_TYPE_DUMMY, "dummy", "dummy", NULL },
@@ -842,6 +843,8 @@ _linktype_get_type (NMPlatform *platform,
return NM_LINK_TYPE_IP6TNL; return NM_LINK_TYPE_IP6TNL;
else if (arptype == ARPHRD_PPP) else if (arptype == ARPHRD_PPP)
return NM_LINK_TYPE_PPP; return NM_LINK_TYPE_PPP;
else if (arptype == ARPHRD_IEEE802154)
return NM_LINK_TYPE_WPAN;
{ {
NMPUtilsEthtoolDriverInfo driver_info; NMPUtilsEthtoolDriverInfo driver_info;