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

platform: recognize Bluetooth BNEP devices via DEVTYPE

Browse Source 
Instead of strcmp()-ing the device name, recognize these devices from their
driver's DEVTYPE.
This commit is contained in:
Dan Williams
2015-05-06 09:20:55 -05:00
parent 77d01c9094
commit baee9080b7
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nm-manager.c
View File

@@ -2187,7 +2187,7 @@ platform_link_added (NMManager *self,
/* Ignore Bluetooth PAN interfaces; they are handled by their NMDeviceBt /* Ignore Bluetooth PAN interfaces; they are handled by their NMDeviceBt
* parent and don't get a separate interface. * parent and don't get a separate interface.
*/ */
if (!strncmp (plink->name, "bnep", STRLEN ("bnep"))) if (plink->type == NM_LINK_TYPE_BNEP)
return; return;
if (device == NULL) { if (device == NULL) {

1
src/nm-types.h
View File

@@ -101,6 +101,7 @@ typedef enum {
NM_LINK_TYPE_VETH, NM_LINK_TYPE_VETH,
NM_LINK_TYPE_VLAN, NM_LINK_TYPE_VLAN,
NM_LINK_TYPE_VXLAN, NM_LINK_TYPE_VXLAN,
NM_LINK_TYPE_BNEP, /* Bluetooth Ethernet emulation */
/* Software types with slaves */ /* Software types with slaves */
NM_LINK_TYPE_BRIDGE = 0x10000 | 0x20000, NM_LINK_TYPE_BRIDGE = 0x10000 | 0x20000,

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

@@ -881,6 +881,7 @@ static const LinkDesc linktypes[] = {
{ NM_LINK_TYPE_VETH, "veth", "veth", NULL }, { NM_LINK_TYPE_VETH, "veth", "veth", NULL },
{ NM_LINK_TYPE_VLAN, "vlan", "vlan", "vlan" }, { NM_LINK_TYPE_VLAN, "vlan", "vlan", "vlan" },
{ NM_LINK_TYPE_VXLAN, "vxlan", "vxlan", "vxlan" }, { NM_LINK_TYPE_VXLAN, "vxlan", "vxlan", "vxlan" },
{ NM_LINK_TYPE_BNEP, "bluetooth", NULL, "bluetooth" },
{ NM_LINK_TYPE_BRIDGE, "bridge", "bridge", "bridge" }, { NM_LINK_TYPE_BRIDGE, "bridge", "bridge", "bridge" },
{ NM_LINK_TYPE_BOND, "bond", "bond", "bond" }, { NM_LINK_TYPE_BOND, "bond", "bond", "bond" },
@@ -980,7 +981,6 @@ link_extract_type (NMPlatform *platform, struct rtnl_link *rtnllink)
else if (arptype == ARPHRD_INFINIBAND) else if (arptype == ARPHRD_INFINIBAND)
return NM_LINK_TYPE_INFINIBAND; return NM_LINK_TYPE_INFINIBAND;
ifname = rtnl_link_get_name (rtnllink); ifname = rtnl_link_get_name (rtnllink);
if (ifname) { if (ifname) {
const char *driver = ethtool_get_driver (ifname); const char *driver = ethtool_get_driver (ifname);
@@ -1007,9 +1007,17 @@ link_extract_type (NMPlatform *platform, struct rtnl_link *rtnllink)
devtype = read_devtype (sysfs_path); devtype = read_devtype (sysfs_path);
for (i = 0; devtype && i < G_N_ELEMENTS (linktypes); i++) { for (i = 0; devtype && i < G_N_ELEMENTS (linktypes); i++) {
if (g_strcmp0 (devtype, linktypes[i].devtype) == 0) if (g_strcmp0 (devtype, linktypes[i].devtype) == 0) {
if (linktypes[i].nm_type == NM_LINK_TYPE_BNEP) {
/* Both BNEP and 6lowpan use DEVTYPE=bluetooth, so we must
* use arptype to distinguish between them.
*/
if (arptype != ARPHRD_ETHER)
continue;
}
return linktypes[i].nm_type; return linktypes[i].nm_type;
} }
}
/* Fallback for drivers that don't call SET_NETDEV_DEVTYPE() */ /* Fallback for drivers that don't call SET_NETDEV_DEVTYPE() */
if (wifi_utils_is_wifi (ifname, sysfs_path)) if (wifi_utils_is_wifi (ifname, sysfs_path))