diff options
| author | Michael Biebl <biebl@debian.org> | 2019-09-30 13:50:14 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-09-30 13:50:14 +0200 |
| commit | 0bef21b7d9274778958532e84565e8b76f1204ee (patch) | |
| tree | 9b6f312103439539009916cbd7352d32853cc553 /src/platform/nm-linux-platform.c | |
| parent | 857b32ce16c33d2fb191da77e9a3f3b542714d74 (diff) | |
| parent | d0425f68f7ee83a1dc5a6ad3688627c1b472a58b (diff) | |
Update upstream source from tag 'upstream/1.20.4'
Update to upstream version '1.20.4' with Debian dir a7248e22a7605bec597b9752dfceb6985ad68a67
Diffstat (limited to 'src/platform/nm-linux-platform.c')
| -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 e2e1e581..d222527d 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -2879,19 +2879,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)), |