diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-09-05 13:51:19 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-09-07 17:22:00 +0200 |
| commit | f53705658910065c876cd7ab024e1f6bff14f66d (patch) | |
| tree | 1abe54ef1b1c657124cd8dd4670b39fe86592e2d | |
| parent | 13bd678dd5dc073f4ca84faa3ff1dfc3a3dce149 (diff) | |
| download | NetworkManager-lr/olpc-mesh.tar.gz | |
platforn/linux: don't fall back to WEXT for OLPC Meshlr/olpc-mesh
nl80211 offers the same functionality sans the bugs.
| -rw-r--r-- | src/platform/nm-linux-platform.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 3a6f18aabe..a1ffd30543 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -2883,19 +2883,11 @@ _new_from_nl_link (NMPlatform *platform, const NMPCache *cache, struct nlmsghdr && obj->_link.ext_data == NULL) { switch (obj->link.type) { case NM_LINK_TYPE_WIFI: + case NM_LINK_TYPE_OLPC_MESH: obj->_link.ext_data = (GObject *) nm_wifi_utils_new (ifi->ifi_index, _genl_sock (NM_LINUX_PLATFORM (platform)), TRUE); break; - case NM_LINK_TYPE_OLPC_MESH: -#if HAVE_WEXT - /* The kernel driver now uses nl80211, but we force use of WEXT because - * the cfg80211 interactions are not quite ready to support access to - * mesh control through nl80211 just yet. - */ - obj->_link.ext_data = (GObject *) nm_wifi_utils_wext_new (ifi->ifi_index, FALSE); -#endif - break; case NM_LINK_TYPE_WPAN: obj->_link.ext_data = (GObject *) nm_wpan_utils_new (ifi->ifi_index, _genl_sock (NM_LINUX_PLATFORM (platform)), |