diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2015-10-29 15:12:33 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-10-30 10:17:08 +0100 |
| commit | c1a40f3ffb967d8b4dd0001d1e110a20a8de5d22 (patch) | |
| tree | c939fcc76535fa992362a0898867e7d6bb11a11d | |
| parent | c9d240d73a11d68c9cfe9cd09b7b112ea7fddbde (diff) | |
| download | NetworkManager-c1a40f3ffb967d8b4dd0001d1e110a20a8de5d22.tar.gz | |
Ignore p2p0 wifi devices from android.
| -rw-r--r-- | src/nm-manager.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index 432ab9f2fe..2eb22516d4 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2001,6 +2001,16 @@ platform_link_added (NMManager *self, !strncmp (plink->name, "ccmni", STRLEN ("ccmni"))) return; + /* + * Ubuntu: Explicitly unmanage p2p Wi-Fi devices exposed by Android JB Wi-Fi drivers. + */ + NMDeviceType devtype = nm_device_get_device_type (device); + if ((plink->type == NM_LINK_TYPE_WIFI) + && !strncmp (plink->name, "p2p0", STRLEN ("p2p0"))) { + nm_log_info (LOGD_HW, "(%s): ignoring P2P wireless iface", plink->name); + return; + } + if (device == NULL) { switch (plink->type) { case NM_LINK_TYPE_WWAN_ETHERNET: |