diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-03-09 15:48:24 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-06-26 16:21:54 +0200 |
| commit | c630a6a2c9a3987042ba80f1e09839eac010c546 (patch) | |
| tree | dcd207892f489e3428ec1bf04ad4f82aa9e3c22e | |
| parent | 4e3d2f5a8541a5c5a22c8295c89c7d20352cbaf1 (diff) | |
| download | NetworkManager-c630a6a2c9a3987042ba80f1e09839eac010c546.tar.gz | |
platform/linux: recognize 6LoWPAN links
| -rw-r--r-- | src/nm-types.h | 1 | ||||
| -rw-r--r-- | src/platform/nm-linux-platform.c | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/nm-types.h b/src/nm-types.h index 5eee83fa55..a441a7a32d 100644 --- a/src/nm-types.h +++ b/src/nm-types.h @@ -151,6 +151,7 @@ typedef enum { NM_LINK_TYPE_WWAN_NET, /* WWAN kernel netdevice */ NM_LINK_TYPE_WIMAX, NM_LINK_TYPE_WPAN, + NM_LINK_TYPE_6LOWPAN, /* 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 d3c2b97670..3230cebc56 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -154,6 +154,13 @@ G_STATIC_ASSERT (RTA_MAX == (__RTA_MAX - 1)); /*****************************************************************************/ +/* Appeared in in kernel prior to 3.13 dated 19 January, 2014 */ +#ifndef ARPHRD_6LOWPAN +#define ARPHRD_6LOWPAN 825 +#endif + +/*****************************************************************************/ + #define IFLA_MACSEC_UNSPEC 0 #define IFLA_MACSEC_SCI 1 #define IFLA_MACSEC_PORT 2 @@ -535,6 +542,7 @@ static const LinkDesc linktypes[] = { { 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_6LOWPAN, "6lowpan", NULL, NULL }, { NM_LINK_TYPE_BNEP, "bluetooth", NULL, "bluetooth" }, { NM_LINK_TYPE_DUMMY, "dummy", "dummy", NULL }, @@ -845,6 +853,8 @@ _linktype_get_type (NMPlatform *platform, return NM_LINK_TYPE_PPP; else if (arptype == ARPHRD_IEEE802154) return NM_LINK_TYPE_WPAN; + else if (arptype == ARPHRD_6LOWPAN) + return NM_LINK_TYPE_6LOWPAN; { NMPUtilsEthtoolDriverInfo driver_info; |