From d0425f68f7ee83a1dc5a6ad3688627c1b472a58b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 30 Sep 2019 13:49:20 +0200 Subject: New upstream version 1.20.4 --- src/platform/nm-linux-platform.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/platform/nm-linux-platform.c') 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)), -- cgit 1.3.0-6-gf8a5