New upstream version 1.29.90 upstream/1.29.90

7 files changed, 0 insertions, 2249 deletions

diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.c b/src/platform/wifi/nm-wifi-utils-nl80211.c
deleted file mode 100644
index dddfa8fa..00000000
--- a/src/platform/wifi/nm-wifi-utils-nl80211.c
+++ /dev/null
@@ -1,1028 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2005 - 2018 Red Hat, Inc.
- * Copyright (C) 2006 - 2008 Novell, Inc.
- * Copyright (C) 2011 Intel Corporation. All rights reserved.
- */
-
-#include "nm-default.h"
-
-#include "nm-wifi-utils-nl80211.h"
-
-#include <sys/ioctl.h>
-#include <net/ethernet.h>
-#include <unistd.h>
-#include <linux/nl80211.h>
-#include <linux/if.h>
-
-#include "platform/nm-netlink.h"
-#include "nm-wifi-utils-private.h"
-#include "platform/nm-platform.h"
-#include "platform/nm-platform-utils.h"
-#include "nm-utils.h"
-
-#define _NMLOG_PREFIX_NAME "wifi-nl80211"
-#define _NMLOG_DOMAIN      LOGD_PLATFORM | LOGD_WIFI
-#define _NMLOG(level, ...)                                                             \
-    G_STMT_START                                                                       \
-    {                                                                                  \
-        char        _ifname_buf[IFNAMSIZ];                                             \
-        const char *_ifname =                                                          \
-            self ? nmp_utils_if_indextoname(self->parent.ifindex, _ifname_buf) : NULL; \
-                                                                                       \
-        nm_log((level),                                                                \
-               _NMLOG_DOMAIN,                                                          \
-               _ifname ?: NULL,                                                        \
-               NULL,                                                                   \
-               "%s%s%s%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__),                        \
-               _NMLOG_PREFIX_NAME,                                                     \
-               NM_PRINT_FMT_QUOTED(_ifname, " (", _ifname, ")", "")                    \
-                   _NM_UTILS_MACRO_REST(__VA_ARGS__));                                 \
-    }                                                                                  \
-    G_STMT_END
-
-typedef struct {
-    NMWifiUtils     parent;
-    struct nl_sock *nl_sock;
-    guint32 *       freqs;
-    int             id;
-    int             num_freqs;
-    int             phy;
-    bool            can_wowlan : 1;
-} NMWifiUtilsNl80211;
-
-typedef struct {
-    NMWifiUtilsClass parent;
-} NMWifiUtilsNl80211Class;
-
-G_DEFINE_TYPE(NMWifiUtilsNl80211, nm_wifi_utils_nl80211, NM_TYPE_WIFI_UTILS)
-
-static int
-ack_handler(struct nl_msg *msg, void *arg)
-{
-    int *done = arg;
-    *done     = 1;
-    return NL_STOP;
-}
-
-static int
-finish_handler(struct nl_msg *msg, void *arg)
-{
-    int *done = arg;
-    *done     = 1;
-    return NL_SKIP;
-}
-
-static int
-error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err, void *arg)
-{
-    int *done = arg;
-    *done     = err->error;
-    return NL_SKIP;
-}
-
-static struct nl_msg *
-_nl80211_alloc_msg(int id, int ifindex, int phy, guint32 cmd, guint32 flags)
-{
-    nm_auto_nlmsg struct nl_msg *msg = NULL;
-
-    msg = nlmsg_alloc();
-    genlmsg_put(msg, 0, 0, id, 0, flags, cmd, 0);
-    NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex);
-    if (phy != -1)
-        NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, phy);
-    return g_steal_pointer(&msg);
-
-nla_put_failure:
-    g_return_val_if_reached(NULL);
-}
-
-static struct nl_msg *
-nl80211_alloc_msg(NMWifiUtilsNl80211 *self, guint32 cmd, guint32 flags)
-{
-    return _nl80211_alloc_msg(self->id, self->parent.ifindex, self->phy, cmd, flags);
-}
-
-static int
-nl80211_send_and_recv(NMWifiUtilsNl80211 *self,
-                      struct nl_msg *     msg,
-                      int (*valid_handler)(struct nl_msg *, void *),
-                      void *valid_data)
-{
-    int                err;
-    int                done = 0;
-    const struct nl_cb cb   = {
-        .err_cb     = error_handler,
-        .err_arg    = &done,
-        .finish_cb  = finish_handler,
-        .finish_arg = &done,
-        .ack_cb     = ack_handler,
-        .ack_arg    = &done,
-        .valid_cb   = valid_handler,
-        .valid_arg  = valid_data,
-    };
-
-    g_return_val_if_fail(msg != NULL, -ENOMEM);
-
-    err = nl_send_auto(self->nl_sock, msg);
-    if (err < 0)
-        return err;
-
-    /* Loop until one of our NL callbacks says we're done; on success
-     * done will be 1, on error it will be < 0.
-     */
-    while (!done) {
-        err = nl_recvmsgs(self->nl_sock, &cb);
-        if (err < 0 && err != -EAGAIN) {
-            /* Kernel scan list can change while we are dumping it, as new scan
-             * results from H/W can arrive. BSS info is assured to be consistent
-             * and we don't need consistent view of whole scan list. Hence do
-             * not warn on DUMP_INTR error for get scan command.
-             */
-            if (err == -NME_NL_DUMP_INTR
-                && genlmsg_hdr(nlmsg_hdr(msg))->cmd == NL80211_CMD_GET_SCAN)
-                break;
-
-            _LOGW("nl_recvmsgs() error: (%d) %s", err, nm_strerror(err));
-            break;
-        }
-    }
-
-    if (err >= 0 && done < 0)
-        err = done;
-    return err;
-}
-
-static void
-dispose(GObject *object)
-{
-    NMWifiUtilsNl80211 *self = NM_WIFI_UTILS_NL80211(object);
-
-    nm_clear_g_free(&self->freqs);
-}
-
-struct nl80211_iface_info {
-    NM80211Mode mode;
-};
-
-static int
-nl80211_iface_info_handler(struct nl_msg *msg, void *arg)
-{
-    struct nl80211_iface_info *info = arg;
-    struct genlmsghdr *        gnlh = nlmsg_data(nlmsg_hdr(msg));
-    struct nlattr *            tb[NL80211_ATTR_MAX + 1];
-
-    if (nla_parse_arr(tb, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0)
-        return NL_SKIP;
-
-    if (!tb[NL80211_ATTR_IFTYPE])
-        return NL_SKIP;
-
-    switch (nla_get_u32(tb[NL80211_ATTR_IFTYPE])) {
-    case NL80211_IFTYPE_ADHOC:
-        info->mode = NM_802_11_MODE_ADHOC;
-        break;
-    case NL80211_IFTYPE_AP:
-        info->mode = NM_802_11_MODE_AP;
-        break;
-    case NL80211_IFTYPE_STATION:
-        info->mode = NM_802_11_MODE_INFRA;
-        break;
-    case NL80211_IFTYPE_MESH_POINT:
-        info->mode = NM_802_11_MODE_MESH;
-        break;
-    }
-
-    return NL_SKIP;
-}
-
-static NM80211Mode
-wifi_nl80211_get_mode(NMWifiUtils *data)
-{
-    NMWifiUtilsNl80211 *      self       = (NMWifiUtilsNl80211 *) data;
-    struct nl80211_iface_info iface_info = {
-        .mode = NM_802_11_MODE_UNKNOWN,
-    };
-    nm_auto_nlmsg struct nl_msg *msg = NULL;
-
-    msg = nl80211_alloc_msg(self, NL80211_CMD_GET_INTERFACE, 0);
-
-    if (nl80211_send_and_recv(self, msg, nl80211_iface_info_handler, &iface_info) < 0)
-        return NM_802_11_MODE_UNKNOWN;
-
-    return iface_info.mode;
-}
-
-static gboolean
-wifi_nl80211_set_mode(NMWifiUtils *data, const NM80211Mode mode)
-{
-    NMWifiUtilsNl80211 *         self = (NMWifiUtilsNl80211 *) data;
-    nm_auto_nlmsg struct nl_msg *msg  = NULL;
-    int                          err;
-
-    msg = nl80211_alloc_msg(self, NL80211_CMD_SET_INTERFACE, 0);
-
-    switch (mode) {
-    case NM_802_11_MODE_INFRA:
-        NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_STATION);
-        break;
-    case NM_802_11_MODE_ADHOC:
-        NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_ADHOC);
-        break;
-    case NM_802_11_MODE_AP:
-        NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_AP);
-        break;
-    case NM_802_11_MODE_MESH:
-        NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_MESH_POINT);
-        break;
-    default:
-        g_assert_not_reached();
-    }
-
-    err = nl80211_send_and_recv(self, msg, NULL, NULL);
-    return err >= 0;
-
-nla_put_failure:
-    g_return_val_if_reached(FALSE);
-}
-
-static gboolean
-wifi_nl80211_set_powersave(NMWifiUtils *data, guint32 powersave)
-{
-    NMWifiUtilsNl80211 *         self = (NMWifiUtilsNl80211 *) data;
-    nm_auto_nlmsg struct nl_msg *msg  = NULL;
-    int                          err;
-
-    msg = nl80211_alloc_msg(self, NL80211_CMD_SET_POWER_SAVE, 0);
-    NLA_PUT_U32(msg,
-                NL80211_ATTR_PS_STATE,
-                powersave == 1 ? NL80211_PS_ENABLED : NL80211_PS_DISABLED);
-    err = nl80211_send_and_recv(self, msg, NULL, NULL);
-    return err >= 0;
-
-nla_put_failure:
-    g_return_val_if_reached(FALSE);
-}
-
-static int
-nl80211_get_wake_on_wlan_handler(struct nl_msg *msg, void *arg)
-{
-    NMSettingWirelessWakeOnWLan *wowl = arg;
-    struct nlattr *              attrs[NL80211_ATTR_MAX + 1];
-    struct nlattr *              trig[NUM_NL80211_WOWLAN_TRIG];
-    struct genlmsghdr *          gnlh = nlmsg_data(nlmsg_hdr(msg));
-
-    nla_parse_arr(attrs, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL);
-
-    if (!attrs[NL80211_ATTR_WOWLAN_TRIGGERS])
-        return NL_SKIP;
-
-    nla_parse_arr(trig,
-                  nla_data(attrs[NL80211_ATTR_WOWLAN_TRIGGERS]),
-                  nla_len(attrs[NL80211_ATTR_WOWLAN_TRIGGERS]),
-                  NULL);
-
-    *wowl = NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE;
-    if (trig[NL80211_WOWLAN_TRIG_ANY])
-        *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY;
-    if (trig[NL80211_WOWLAN_TRIG_DISCONNECT])
-        *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT;
-    if (trig[NL80211_WOWLAN_TRIG_MAGIC_PKT])
-        *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC;
-    if (trig[NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE])
-        *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE;
-    if (trig[NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST])
-        *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST;
-    if (trig[NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE])
-        *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE;
-    if (trig[NL80211_WOWLAN_TRIG_RFKILL_RELEASE])
-        *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE;
-    if (trig[NL80211_WOWLAN_TRIG_TCP_CONNECTION])
-        *wowl |= NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP;
-
-    return NL_SKIP;
-}
-
-static NMSettingWirelessWakeOnWLan
-wifi_nl80211_get_wake_on_wlan(NMWifiUtils *data)
-{
-    NMWifiUtilsNl80211 *         self = (NMWifiUtilsNl80211 *) data;
-    NMSettingWirelessWakeOnWLan  wowl = NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE;
-    nm_auto_nlmsg struct nl_msg *msg  = NULL;
-
-    msg = nl80211_alloc_msg(self, NL80211_CMD_GET_WOWLAN, 0);
-
-    nl80211_send_and_recv(self, msg, nl80211_get_wake_on_wlan_handler, &wowl);
-
-    return wowl;
-}
-
-static gboolean
-wifi_nl80211_set_wake_on_wlan(NMWifiUtils *data, NMSettingWirelessWakeOnWLan wowl)
-{
-    NMWifiUtilsNl80211 *         self = (NMWifiUtilsNl80211 *) data;
-    nm_auto_nlmsg struct nl_msg *msg  = NULL;
-    struct nlattr *              triggers;
-    int                          err;
-
-    if (wowl == NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE)
-        return TRUE;
-
-    msg = nl80211_alloc_msg(self, NL80211_CMD_SET_WOWLAN, 0);
-
-    triggers = nla_nest_start(msg, NL80211_ATTR_WOWLAN_TRIGGERS);
-    if (!triggers)
-        goto nla_put_failure;
-
-    if (NM_FLAGS_HAS(wowl, NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY))
-        NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_ANY);
-    if (NM_FLAGS_HAS(wowl, NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT))
-        NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_DISCONNECT);
-    if (NM_FLAGS_HAS(wowl, NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC))
-        NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_MAGIC_PKT);
-    if (NM_FLAGS_HAS(wowl, NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE))
-        NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE);
-    if (NM_FLAGS_HAS(wowl, NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST))
-        NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST);
-    if (NM_FLAGS_HAS(wowl, NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE))
-        NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE);
-    if (NM_FLAGS_HAS(wowl, NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE))
-        NLA_PUT_FLAG(msg, NL80211_WOWLAN_TRIG_RFKILL_RELEASE);
-
-    nla_nest_end(msg, triggers);
-
-    err = nl80211_send_and_recv(self, msg, NULL, NULL);
-
-    return err >= 0;
-
-nla_put_failure:
-    g_return_val_if_reached(FALSE);
-}
-
-/* @divisor: pass what value @xbm should be divided by to get dBm */
-static guint32
-nl80211_xbm_to_percent(gint32 xbm, guint32 divisor)
-{
-#define NOISE_FLOOR_DBM -90
-#define SIGNAL_MAX_DBM  -20
-
-    xbm /= divisor;
-    xbm = CLAMP(xbm, NOISE_FLOOR_DBM, SIGNAL_MAX_DBM);
-
-    return 100
-           - 70
-                 * (((float) SIGNAL_MAX_DBM - (float) xbm)
-                    / ((float) SIGNAL_MAX_DBM - (float) NOISE_FLOOR_DBM));
-}
-
-struct nl80211_bss_info {
-    guint32  freq;
-    guint8   bssid[ETH_ALEN];
-    guint8   ssid[32];
-    guint32  ssid_len;
-    guint32  beacon_signal;
-    gboolean valid;
-};
-
-#define WLAN_EID_SSID 0
-
-static void
-find_ssid(guint8 *ies, guint32 ies_len, guint8 **ssid, guint32 *ssid_len)
-{
-    *ssid     = NULL;
-    *ssid_len = 0;
-
-    while (ies_len > 2 && ies[0] != WLAN_EID_SSID) {
-        ies_len -= ies[1] + 2;
-        ies += ies[1] + 2;
-    }
-    if (ies_len < 2)
-        return;
-    if (ies_len < 2 + ies[1])
-        return;
-
-    *ssid_len = ies[1];
-    *ssid     = ies + 2;
-}
-
-static int
-nl80211_bss_dump_handler(struct nl_msg *msg, void *arg)
-{
-    static const struct nla_policy bss_policy[] = {
-        [NL80211_BSS_TSF]                  = {.type = NLA_U64},
-        [NL80211_BSS_FREQUENCY]            = {.type = NLA_U32},
-        [NL80211_BSS_BSSID]                = {.minlen = ETH_ALEN},
-        [NL80211_BSS_BEACON_INTERVAL]      = {.type = NLA_U16},
-        [NL80211_BSS_CAPABILITY]           = {.type = NLA_U16},
-        [NL80211_BSS_INFORMATION_ELEMENTS] = {},
-        [NL80211_BSS_SIGNAL_MBM]           = {.type = NLA_U32},
-        [NL80211_BSS_SIGNAL_UNSPEC]        = {.type = NLA_U8},
-        [NL80211_BSS_STATUS]               = {.type = NLA_U32},
-    };
-    struct nl80211_bss_info *info = arg;
-    struct genlmsghdr *      gnlh = nlmsg_data(nlmsg_hdr(msg));
-    struct nlattr *          tb[NL80211_ATTR_MAX + 1];
-    struct nlattr *          bss[G_N_ELEMENTS(bss_policy)];
-    guint32                  status;
-
-    if (nla_parse_arr(tb, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0)
-        return NL_SKIP;
-
-    if (tb[NL80211_ATTR_BSS] == NULL)
-        return NL_SKIP;
-
-    if (nla_parse_nested_arr(bss, tb[NL80211_ATTR_BSS], bss_policy))
-        return NL_SKIP;
-
-    if (bss[NL80211_BSS_STATUS] == NULL)
-        return NL_SKIP;
-
-    status = nla_get_u32(bss[NL80211_BSS_STATUS]);
-
-    if (status != NL80211_BSS_STATUS_ASSOCIATED && status != NL80211_BSS_STATUS_IBSS_JOINED)
-        return NL_SKIP;
-
-    if (bss[NL80211_BSS_BSSID] == NULL)
-        return NL_SKIP;
-    memcpy(info->bssid, nla_data(bss[NL80211_BSS_BSSID]), ETH_ALEN);
-
-    if (bss[NL80211_BSS_FREQUENCY])
-        info->freq = nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
-
-    if (bss[NL80211_BSS_SIGNAL_UNSPEC])
-        info->beacon_signal = nla_get_u8(bss[NL80211_BSS_SIGNAL_UNSPEC]);
-
-    if (bss[NL80211_BSS_SIGNAL_MBM])
-        info->beacon_signal = nl80211_xbm_to_percent(nla_get_u32(bss[NL80211_BSS_SIGNAL_MBM]), 100);
-
-    if (bss[NL80211_BSS_INFORMATION_ELEMENTS]) {
-        guint8 *ssid;
-        guint32 ssid_len;
-
-        find_ssid(nla_data(bss[NL80211_BSS_INFORMATION_ELEMENTS]),
-                  nla_len(bss[NL80211_BSS_INFORMATION_ELEMENTS]),
-                  &ssid,
-                  &ssid_len);
-        if (ssid && ssid_len && ssid_len <= sizeof(info->ssid)) {
-            memcpy(info->ssid, ssid, ssid_len);
-            info->ssid_len = ssid_len;
-        }
-    }
-
-    info->valid = TRUE;
-
-    return NL_SKIP;
-}
-
-static void
-nl80211_get_bss_info(NMWifiUtilsNl80211 *self, struct nl80211_bss_info *bss_info)
-{
-    nm_auto_nlmsg struct nl_msg *msg = NULL;
-
-    memset(bss_info, 0, sizeof(*bss_info));
-
-    msg = nl80211_alloc_msg(self, NL80211_CMD_GET_SCAN, NLM_F_DUMP);
-
-    nl80211_send_and_recv(self, msg, nl80211_bss_dump_handler, bss_info);
-}
-
-static guint32
-wifi_nl80211_get_freq(NMWifiUtils *data)
-{
-    NMWifiUtilsNl80211 *    self = (NMWifiUtilsNl80211 *) data;
-    struct nl80211_bss_info bss_info;
-
-    nl80211_get_bss_info(self, &bss_info);
-
-    return bss_info.freq;
-}
-
-static guint32
-wifi_nl80211_find_freq(NMWifiUtils *data, const guint32 *freqs)
-{
-    NMWifiUtilsNl80211 *self = (NMWifiUtilsNl80211 *) data;
-    int                 i;
-
-    for (i = 0; i < self->num_freqs; i++) {
-        while (*freqs) {
-            if (self->freqs[i] == *freqs)
-                return *freqs;
-            freqs++;
-        }
-    }
-    return 0;
-}
-
-static gboolean
-wifi_nl80211_get_bssid(NMWifiUtils *data, guint8 *out_bssid)
-{
-    NMWifiUtilsNl80211 *    self = (NMWifiUtilsNl80211 *) data;
-    struct nl80211_bss_info bss_info;
-
-    nl80211_get_bss_info(self, &bss_info);
-
-    if (bss_info.valid)
-        memcpy(out_bssid, bss_info.bssid, ETH_ALEN);
-
-    return bss_info.valid;
-}
-
-struct nl80211_station_info {
-    guint32  txrate;
-    gboolean txrate_valid;
-    guint8   signal;
-    gboolean signal_valid;
-};
-
-static int
-nl80211_station_handler(struct nl_msg *msg, void *arg)
-{
-    static const struct nla_policy stats_policy[] = {
-        [NL80211_STA_INFO_INACTIVE_TIME] = {.type = NLA_U32},
-        [NL80211_STA_INFO_RX_BYTES]      = {.type = NLA_U32},
-        [NL80211_STA_INFO_TX_BYTES]      = {.type = NLA_U32},
-        [NL80211_STA_INFO_RX_PACKETS]    = {.type = NLA_U32},
-        [NL80211_STA_INFO_TX_PACKETS]    = {.type = NLA_U32},
-        [NL80211_STA_INFO_SIGNAL]        = {.type = NLA_U8},
-        [NL80211_STA_INFO_TX_BITRATE]    = {.type = NLA_NESTED},
-        [NL80211_STA_INFO_LLID]          = {.type = NLA_U16},
-        [NL80211_STA_INFO_PLID]          = {.type = NLA_U16},
-        [NL80211_STA_INFO_PLINK_STATE]   = {.type = NLA_U8},
-    };
-    static const struct nla_policy rate_policy[] = {
-        [NL80211_RATE_INFO_BITRATE]      = {.type = NLA_U16},
-        [NL80211_RATE_INFO_MCS]          = {.type = NLA_U8},
-        [NL80211_RATE_INFO_40_MHZ_WIDTH] = {.type = NLA_FLAG},
-        [NL80211_RATE_INFO_SHORT_GI]     = {.type = NLA_FLAG},
-    };
-    struct nlattr *              rinfo[G_N_ELEMENTS(rate_policy)];
-    struct nlattr *              sinfo[G_N_ELEMENTS(stats_policy)];
-    struct nl80211_station_info *info = arg;
-    struct nlattr *              tb[NL80211_ATTR_MAX + 1];
-    struct genlmsghdr *          gnlh = nlmsg_data(nlmsg_hdr(msg));
-
-    if (nla_parse_arr(tb, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0)
-        return NL_SKIP;
-
-    if (tb[NL80211_ATTR_STA_INFO] == NULL)
-        return NL_SKIP;
-
-    if (nla_parse_nested_arr(sinfo, tb[NL80211_ATTR_STA_INFO], stats_policy))
-        return NL_SKIP;
-
-    if (sinfo[NL80211_STA_INFO_TX_BITRATE] == NULL)
-        return NL_SKIP;
-
-    if (nla_parse_nested_arr(rinfo, sinfo[NL80211_STA_INFO_TX_BITRATE], rate_policy))
-        return NL_SKIP;
-
-    if (rinfo[NL80211_RATE_INFO_BITRATE] == NULL)
-        return NL_SKIP;
-
-    /* convert from nl80211's units of 100kbps to NM's kbps */
-    info->txrate       = nla_get_u16(rinfo[NL80211_RATE_INFO_BITRATE]) * 100;
-    info->txrate_valid = TRUE;
-
-    if (sinfo[NL80211_STA_INFO_SIGNAL] != NULL) {
-        info->signal =
-            nl80211_xbm_to_percent((gint8) nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL]), 1);
-        info->signal_valid = TRUE;
-    }
-
-    return NL_SKIP;
-}
-
-static void
-nl80211_get_ap_info(NMWifiUtilsNl80211 *self, struct nl80211_station_info *sta_info)
-{
-    nm_auto_nlmsg struct nl_msg *msg = NULL;
-    struct nl80211_bss_info      bss_info;
-
-    memset(sta_info, 0, sizeof(*sta_info));
-
-    nl80211_get_bss_info(self, &bss_info);
-    if (!bss_info.valid)
-        return;
-
-    msg = nl80211_alloc_msg(self, NL80211_CMD_GET_STATION, 0);
-    NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, bss_info.bssid);
-
-    nl80211_send_and_recv(self, msg, nl80211_station_handler, sta_info);
-    if (!sta_info->signal_valid) {
-        /* Fall back to bss_info signal quality (both are in percent) */
-        sta_info->signal = bss_info.beacon_signal;
-    }
-
-    return;
-
-nla_put_failure:
-    g_return_if_reached();
-}
-
-static guint32
-wifi_nl80211_get_rate(NMWifiUtils *data)
-{
-    NMWifiUtilsNl80211 *        self = (NMWifiUtilsNl80211 *) data;
-    struct nl80211_station_info sta_info;
-
-    nl80211_get_ap_info(self, &sta_info);
-
-    return sta_info.txrate;
-}
-
-static int
-wifi_nl80211_get_qual(NMWifiUtils *data)
-{
-    NMWifiUtilsNl80211 *        self = (NMWifiUtilsNl80211 *) data;
-    struct nl80211_station_info sta_info;
-
-    nl80211_get_ap_info(self, &sta_info);
-    return sta_info.signal;
-}
-
-static gboolean
-wifi_nl80211_indicate_addressing_running(NMWifiUtils *data, gboolean running)
-{
-    NMWifiUtilsNl80211 *         self = (NMWifiUtilsNl80211 *) data;
-    nm_auto_nlmsg struct nl_msg *msg  = NULL;
-    int                          err;
-
-    msg = nl80211_alloc_msg(self,
-                            running ? 98 /* NL80211_CMD_CRIT_PROTOCOL_START */
-                                    : 99 /* NL80211_CMD_CRIT_PROTOCOL_STOP */,
-                            0);
-    /* Despite the DHCP name, we're using this for any type of IP addressing,
-     * DHCPv4, DHCPv6, and IPv6 SLAAC.
-     */
-    NLA_PUT_U16(msg, 179 /* NL80211_ATTR_CRIT_PROT_ID */, 1 /* NL80211_CRIT_PROTO_DHCP */);
-    if (running) {
-        /* Give DHCP 5 seconds to complete */
-        NLA_PUT_U16(msg, 180 /* NL80211_ATTR_MAX_CRIT_PROT_DURATION */, 5000);
-    }
-
-    err = nl80211_send_and_recv(self, msg, NULL, NULL);
-    return err >= 0;
-
-nla_put_failure:
-    g_return_val_if_reached(FALSE);
-}
-
-struct nl80211_device_info {
-    NMWifiUtilsNl80211 *self;
-    int                 phy;
-    guint32 *           freqs;
-    int                 num_freqs;
-    guint32             freq;
-    guint32             caps;
-    gboolean            can_scan;
-    gboolean            can_scan_ssid;
-    gboolean            supported;
-    gboolean            success;
-    gboolean            can_wowlan;
-};
-
-#define WLAN_CIPHER_SUITE_USE_GROUP 0x000FAC00
-#define WLAN_CIPHER_SUITE_WEP40     0x000FAC01
-#define WLAN_CIPHER_SUITE_TKIP      0x000FAC02
-#define WLAN_CIPHER_SUITE_CCMP      0x000FAC04
-#define WLAN_CIPHER_SUITE_WEP104    0x000FAC05
-#define WLAN_CIPHER_SUITE_AES_CMAC  0x000FAC06
-#define WLAN_CIPHER_SUITE_GCMP      0x000FAC08
-#define WLAN_CIPHER_SUITE_SMS4      0x00147201
-
-static int
-nl80211_wiphy_info_handler(struct nl_msg *msg, void *arg)
-{
-    static const struct nla_policy freq_policy[] = {
-        [NL80211_FREQUENCY_ATTR_FREQ]     = {.type = NLA_U32},
-        [NL80211_FREQUENCY_ATTR_DISABLED] = {.type = NLA_FLAG},
-#ifdef NL80211_FREQUENCY_ATTR_NO_IR
-        [NL80211_FREQUENCY_ATTR_NO_IR] = {.type = NLA_FLAG},
-#else
-        [NL80211_FREQUENCY_ATTR_PASSIVE_SCAN] = {.type = NLA_FLAG},
-        [NL80211_FREQUENCY_ATTR_NO_IBSS]      = {.type = NLA_FLAG},
-#endif
-        [NL80211_FREQUENCY_ATTR_RADAR]        = {.type = NLA_FLAG},
-        [NL80211_FREQUENCY_ATTR_MAX_TX_POWER] = {.type = NLA_U32},
-    };
-    struct nlattr *             tb[NL80211_ATTR_MAX + 1];
-    struct genlmsghdr *         gnlh = nlmsg_data(nlmsg_hdr(msg));
-    struct nl80211_device_info *info = arg;
-    NMWifiUtilsNl80211 *        self = info->self;
-    struct nlattr *             tb_band[NL80211_BAND_ATTR_MAX + 1];
-    struct nlattr *             tb_freq[G_N_ELEMENTS(freq_policy)];
-    struct nlattr *             nl_band;
-    struct nlattr *             nl_freq;
-    int                         rem_freq;
-    int                         rem_band;
-    int                         freq_idx;
-
-#ifdef NL80211_FREQUENCY_ATTR_NO_IR
-    G_STATIC_ASSERT_EXPR(NL80211_FREQUENCY_ATTR_PASSIVE_SCAN == NL80211_FREQUENCY_ATTR_NO_IR
-                         && NL80211_FREQUENCY_ATTR_NO_IBSS == NL80211_FREQUENCY_ATTR_NO_IR);
-#else
-    G_STATIC_ASSERT_EXPR(NL80211_FREQUENCY_ATTR_PASSIVE_SCAN != NL80211_FREQUENCY_ATTR_NO_IBSS);
-#endif
-
-    if (nla_parse_arr(tb, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0)
-        return NL_SKIP;
-
-    if (tb[NL80211_ATTR_WIPHY] == NULL || tb[NL80211_ATTR_WIPHY_BANDS] == NULL)
-        return NL_SKIP;
-
-    info->phy = nla_get_u32(tb[NL80211_ATTR_WIPHY]);
-
-    if (tb[NL80211_ATTR_WIPHY_FREQ])
-        info->freq = nla_get_u32(tb[NL80211_ATTR_WIPHY_FREQ]);
-    else
-        info->freq = 0;
-
-    if (tb[NL80211_ATTR_MAX_NUM_SCAN_SSIDS]) {
-        info->can_scan_ssid = nla_get_u8(tb[NL80211_ATTR_MAX_NUM_SCAN_SSIDS]) > 0;
-    } else {
-        /* old kernel that only had mac80211, so assume it can */
-        info->can_scan_ssid = TRUE;
-    }
-
-    if (tb[NL80211_ATTR_SUPPORTED_COMMANDS]) {
-        struct nlattr *nl_cmd;
-        int            i;
-
-        nla_for_each_nested (nl_cmd, tb[NL80211_ATTR_SUPPORTED_COMMANDS], i) {
-            switch (nla_get_u32(nl_cmd)) {
-            case NL80211_CMD_TRIGGER_SCAN:
-                info->can_scan = TRUE;
-                break;
-            case NL80211_CMD_CONNECT:
-            case NL80211_CMD_AUTHENTICATE:
-                /* Only devices that support CONNECT or AUTH actually support
-                 * 802.11, unlike say ipw2x00 (up to at least kernel 3.4) which
-                 * has minimal info support, but no actual command support.
-                 * This check mirrors what wpa_supplicant does to determine
-                 * whether or not to use the nl80211 driver.
-                 */
-                info->supported = TRUE;
-                break;
-            default:
-                break;
-            }
-        }
-    }
-
-    /* Find number of supported frequencies */
-    info->num_freqs = 0;
-
-    nla_for_each_nested (nl_band, tb[NL80211_ATTR_WIPHY_BANDS], rem_band) {
-        if (nla_parse_nested_arr(tb_band, nl_band, NULL) < 0)
-            return NL_SKIP;
-
-        nla_for_each_nested (nl_freq, tb_band[NL80211_BAND_ATTR_FREQS], rem_freq) {
-            if (nla_parse_nested_arr(tb_freq, nl_freq, freq_policy) < 0)
-                continue;
-
-            if (!tb_freq[NL80211_FREQUENCY_ATTR_FREQ])
-                continue;
-
-            info->num_freqs++;
-        }
-    }
-
-    /* Read supported frequencies */
-    info->freqs = g_malloc0(sizeof(guint32) * info->num_freqs);
-
-    freq_idx = 0;
-    nla_for_each_nested (nl_band, tb[NL80211_ATTR_WIPHY_BANDS], rem_band) {
-        if (nla_parse_nested_arr(tb_band, nl_band, NULL) < 0)
-            return NL_SKIP;
-
-        nla_for_each_nested (nl_freq, tb_band[NL80211_BAND_ATTR_FREQS], rem_freq) {
-            if (nla_parse_nested_arr(tb_freq, nl_freq, freq_policy) < 0)
-                continue;
-
-            if (!tb_freq[NL80211_FREQUENCY_ATTR_FREQ])
-                continue;
-
-            info->freqs[freq_idx] = nla_get_u32(tb_freq[NL80211_FREQUENCY_ATTR_FREQ]);
-
-            info->caps |= NM_WIFI_DEVICE_CAP_FREQ_VALID;
-
-            if (info->freqs[freq_idx] > 2400 && info->freqs[freq_idx] < 2500)
-                info->caps |= NM_WIFI_DEVICE_CAP_FREQ_2GHZ;
-            if (info->freqs[freq_idx] > 4900 && info->freqs[freq_idx] < 6000)
-                info->caps |= NM_WIFI_DEVICE_CAP_FREQ_5GHZ;
-
-            freq_idx++;
-        }
-    }
-
-    /* Read security/encryption support */
-    if (tb[NL80211_ATTR_CIPHER_SUITES]) {
-        guint32 *ciphers = nla_data(tb[NL80211_ATTR_CIPHER_SUITES]);
-        guint    i, num;
-
-        num = nla_len(tb[NL80211_ATTR_CIPHER_SUITES]) / sizeof(guint32);
-        for (i = 0; i < num; i++) {
-            switch (ciphers[i]) {
-            case WLAN_CIPHER_SUITE_WEP40:
-                info->caps |= NM_WIFI_DEVICE_CAP_CIPHER_WEP40;
-                break;
-            case WLAN_CIPHER_SUITE_WEP104:
-                info->caps |= NM_WIFI_DEVICE_CAP_CIPHER_WEP104;
-                break;
-            case WLAN_CIPHER_SUITE_TKIP:
-                info->caps |= (NM_WIFI_DEVICE_CAP_CIPHER_TKIP | NM_WIFI_DEVICE_CAP_WPA);
-                break;
-            case WLAN_CIPHER_SUITE_CCMP:
-                info->caps |= (NM_WIFI_DEVICE_CAP_CIPHER_CCMP | NM_WIFI_DEVICE_CAP_RSN);
-                break;
-            case WLAN_CIPHER_SUITE_AES_CMAC:
-            case WLAN_CIPHER_SUITE_GCMP:
-            case WLAN_CIPHER_SUITE_SMS4:
-                break;
-            default:
-                _LOGD("don't know the meaning of NL80211_ATTR_CIPHER_SUITE %#8.8x.", ciphers[i]);
-                break;
-            }
-        }
-    }
-
-    if (tb[NL80211_ATTR_SUPPORTED_IFTYPES]) {
-        struct nlattr *nl_mode;
-        int            i;
-
-        nla_for_each_nested (nl_mode, tb[NL80211_ATTR_SUPPORTED_IFTYPES], i) {
-            switch (nla_type(nl_mode)) {
-            case NL80211_IFTYPE_AP:
-                info->caps |= NM_WIFI_DEVICE_CAP_AP;
-                break;
-            case NL80211_IFTYPE_ADHOC:
-                info->caps |= NM_WIFI_DEVICE_CAP_ADHOC;
-                break;
-            case NL80211_IFTYPE_MESH_POINT:
-                info->caps |= NM_WIFI_DEVICE_CAP_MESH;
-                break;
-            }
-        }
-    }
-
-    if (tb[NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED])
-        info->can_wowlan = TRUE;
-
-    if (tb[NL80211_ATTR_SUPPORT_IBSS_RSN])
-        info->caps |= NM_WIFI_DEVICE_CAP_IBSS_RSN;
-
-    info->success = TRUE;
-
-    return NL_SKIP;
-}
-
-static guint32
-wifi_nl80211_get_mesh_channel(NMWifiUtils *data)
-{
-    NMWifiUtilsNl80211 *         self        = (NMWifiUtilsNl80211 *) data;
-    nm_auto_nlmsg struct nl_msg *msg         = NULL;
-    struct nl80211_device_info   device_info = {.self = self};
-    int                          i;
-
-    msg = nl80211_alloc_msg(self, NL80211_CMD_GET_WIPHY, 0);
-
-    if (nl80211_send_and_recv(self, msg, nl80211_wiphy_info_handler, &device_info) < 0) {
-        _LOGW("NL80211_CMD_GET_WIPHY request failed");
-        return 0;
-    }
-
-    for (i = 0; i < self->num_freqs; i++) {
-        if (device_info.freq == self->freqs[i])
-            return i + 1;
-    }
-    return 0;
-}
-
-static gboolean
-wifi_nl80211_set_mesh_channel(NMWifiUtils *data, guint32 channel)
-{
-    NMWifiUtilsNl80211 *         self = (NMWifiUtilsNl80211 *) data;
-    nm_auto_nlmsg struct nl_msg *msg  = NULL;
-    int                          err;
-
-    if (channel > self->num_freqs)
-        return FALSE;
-
-    msg = nl80211_alloc_msg(self, NL80211_CMD_SET_WIPHY, 0);
-    NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, self->freqs[channel - 1]);
-    err = nl80211_send_and_recv(self, msg, NULL, NULL);
-    return err >= 0;
-
-nla_put_failure:
-    g_return_val_if_reached(FALSE);
-}
-
-static gboolean
-wifi_nl80211_set_mesh_ssid(NMWifiUtils *data, const guint8 *ssid, gsize len)
-{
-    NMWifiUtilsNl80211 *         self = (NMWifiUtilsNl80211 *) data;
-    nm_auto_nlmsg struct nl_msg *msg  = NULL;
-    int                          err;
-
-    msg = nl80211_alloc_msg(self, NL80211_CMD_SET_INTERFACE, 0);
-    NLA_PUT(msg, NL80211_ATTR_MESH_ID, len, ssid);
-    err = nl80211_send_and_recv(self, msg, NULL, NULL);
-    return err >= 0;
-
-nla_put_failure:
-    g_return_val_if_reached(FALSE);
-}
-
-static void
-nm_wifi_utils_nl80211_init(NMWifiUtilsNl80211 *self)
-{}
-
-static void
-nm_wifi_utils_nl80211_class_init(NMWifiUtilsNl80211Class *klass)
-{
-    GObjectClass *    object_class     = G_OBJECT_CLASS(klass);
-    NMWifiUtilsClass *wifi_utils_class = NM_WIFI_UTILS_CLASS(klass);
-
-    object_class->dispose = dispose;
-
-    wifi_utils_class->get_mode                    = wifi_nl80211_get_mode;
-    wifi_utils_class->set_mode                    = wifi_nl80211_set_mode;
-    wifi_utils_class->set_powersave               = wifi_nl80211_set_powersave;
-    wifi_utils_class->get_wake_on_wlan            = wifi_nl80211_get_wake_on_wlan,
-    wifi_utils_class->set_wake_on_wlan            = wifi_nl80211_set_wake_on_wlan,
-    wifi_utils_class->get_freq                    = wifi_nl80211_get_freq;
-    wifi_utils_class->find_freq                   = wifi_nl80211_find_freq;
-    wifi_utils_class->get_bssid                   = wifi_nl80211_get_bssid;
-    wifi_utils_class->get_rate                    = wifi_nl80211_get_rate;
-    wifi_utils_class->get_qual                    = wifi_nl80211_get_qual;
-    wifi_utils_class->indicate_addressing_running = wifi_nl80211_indicate_addressing_running;
-    wifi_utils_class->get_mesh_channel            = wifi_nl80211_get_mesh_channel;
-    wifi_utils_class->set_mesh_channel            = wifi_nl80211_set_mesh_channel;
-    wifi_utils_class->set_mesh_ssid               = wifi_nl80211_set_mesh_ssid;
-}
-
-NMWifiUtils *
-nm_wifi_utils_nl80211_new(int ifindex, struct nl_sock *genl)
-{
-    gs_unref_object NMWifiUtilsNl80211 *self        = NULL;
-    nm_auto_nlmsg struct nl_msg *       msg         = NULL;
-    struct nl80211_device_info          device_info = {};
-
-    if (!genl)
-        return NULL;
-
-    self = g_object_new(NM_TYPE_WIFI_UTILS_NL80211, NULL);
-
-    self->parent.ifindex = ifindex;
-    self->nl_sock        = genl;
-
-    self->id = genl_ctrl_resolve(self->nl_sock, "nl80211");
-    if (self->id < 0) {
-        _LOGD("genl_ctrl_resolve: failed to resolve \"nl80211\"");
-        return NULL;
-    }
-
-    self->phy = -1;
-
-    msg = nl80211_alloc_msg(self, NL80211_CMD_GET_WIPHY, 0);
-
-    device_info.self = self;
-    if (nl80211_send_and_recv(self, msg, nl80211_wiphy_info_handler, &device_info) < 0) {
-        _LOGD("NL80211_CMD_GET_WIPHY request failed");
-        return NULL;
-    }
-
-    if (!device_info.success) {
-        _LOGD("NL80211_CMD_GET_WIPHY request indicated failure");
-        return NULL;
-    }
-
-    if (!device_info.supported) {
-        _LOGD("driver does not fully support nl80211, falling back to WEXT");
-        return NULL;
-    }
-
-    if (!device_info.can_scan_ssid) {
-        _LOGE("driver does not support SSID scans");
-        return NULL;
-    }
-
-    if (device_info.num_freqs == 0 || device_info.freqs == NULL) {
-        _LOGE("driver reports no supported frequencies");
-        return NULL;
-    }
-
-    if (device_info.caps == 0) {
-        _LOGE("driver doesn't report support of any encryption");
-        return NULL;
-    }
-
-    self->phy         = device_info.phy;
-    self->freqs       = device_info.freqs;
-    self->num_freqs   = device_info.num_freqs;
-    self->parent.caps = device_info.caps;
-    self->can_wowlan  = device_info.can_wowlan;
-
-    _LOGD("using nl80211 for Wi-Fi device control");
-    return (NMWifiUtils *) g_steal_pointer(&self);
-}
diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.h b/src/platform/wifi/nm-wifi-utils-nl80211.h
deleted file mode 100644
index 59fc1acc..00000000
--- a/src/platform/wifi/nm-wifi-utils-nl80211.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2011 Intel Corporation. All rights reserved.
- * Copyright (C) 2018 Red Hat, Inc.
- */
-
-#ifndef __WIFI_UTILS_NL80211_H__
-#define __WIFI_UTILS_NL80211_H__
-
-#include "nm-wifi-utils.h"
-#include "platform/nm-netlink.h"
-
-#define NM_TYPE_WIFI_UTILS_NL80211 (nm_wifi_utils_nl80211_get_type())
-#define NM_WIFI_UTILS_NL80211(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_WIFI_UTILS_NL80211, NMWifiUtilsNl80211))
-#define NM_WIFI_UTILS_NL80211_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_WIFI_UTILS_NL80211, NMWifiUtilsNl80211Class))
-#define NM_IS_WIFI_UTILS_NL80211(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_WIFI_UTILS_NL80211))
-#define NM_IS_WIFI_UTILS_NL80211_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_WIFI_UTILS_NL80211))
-#define NM_WIFI_UTILS_NL80211_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_WIFI_UTILS_NL80211, NMWifiUtilsNl80211Class))
-
-GType nm_wifi_utils_nl80211_get_type(void);
-
-NMWifiUtils *nm_wifi_utils_nl80211_new(int ifindex, struct nl_sock *genl);
-
-#endif /* __WIFI_UTILS_NL80211_H__ */
diff --git a/src/platform/wifi/nm-wifi-utils-private.h b/src/platform/wifi/nm-wifi-utils-private.h
deleted file mode 100644
index 1a5303a6..00000000
--- a/src/platform/wifi/nm-wifi-utils-private.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2011 - 2018 Red Hat, Inc.
- */
-
-#ifndef __WIFI_UTILS_PRIVATE_H__
-#define __WIFI_UTILS_PRIVATE_H__
-
-#include "nm-dbus-interface.h"
-#include "nm-wifi-utils.h"
-
-typedef struct {
-    GObjectClass parent;
-
-    NM80211Mode (*get_mode)(NMWifiUtils *data);
-
-    gboolean (*set_mode)(NMWifiUtils *data, const NM80211Mode mode);
-
-    /* Set power saving mode on an interface */
-    gboolean (*set_powersave)(NMWifiUtils *data, guint32 powersave);
-
-    /* Get WakeOnWLAN configuration on an interface */
-    NMSettingWirelessWakeOnWLan (*get_wake_on_wlan)(NMWifiUtils *data);
-
-    /* Set WakeOnWLAN mode on an interface */
-    gboolean (*set_wake_on_wlan)(NMWifiUtils *data, NMSettingWirelessWakeOnWLan wowl);
-
-    /* Return current frequency in MHz (really associated BSS frequency) */
-    guint32 (*get_freq)(NMWifiUtils *data);
-
-    /* Return first supported frequency in the zero-terminated list */
-    guint32 (*find_freq)(NMWifiUtils *data, const guint32 *freqs);
-
-    /* Return current bitrate in Kbps */
-    guint32 (*get_rate)(NMWifiUtils *data);
-
-    gboolean (*get_bssid)(NMWifiUtils *data, guint8 *out_bssid);
-
-    /* Return a signal strength percentage 0 - 100% for the current BSSID;
-     * return -1 on errors or if not associated.
-     */
-    int (*get_qual)(NMWifiUtils *data);
-
-    /* OLPC Mesh-only functions */
-
-    guint32 (*get_mesh_channel)(NMWifiUtils *data);
-
-    /* channel == 0 means "auto channel" */
-    gboolean (*set_mesh_channel)(NMWifiUtils *data, guint32 channel);
-
-    /* ssid == NULL means "auto SSID" */
-    gboolean (*set_mesh_ssid)(NMWifiUtils *data, const guint8 *ssid, gsize len);
-
-    gboolean (*indicate_addressing_running)(NMWifiUtils *data, gboolean running);
-} NMWifiUtilsClass;
-
-struct NMWifiUtils {
-    GObject parent;
-
-    int                      ifindex;
-    NMDeviceWifiCapabilities caps;
-};
-
-#endif /* __WIFI_UTILS_PRIVATE_H__ */
diff --git a/src/platform/wifi/nm-wifi-utils-wext.c b/src/platform/wifi/nm-wifi-utils-wext.c
deleted file mode 100644
index 8299415d..00000000
--- a/src/platform/wifi/nm-wifi-utils-wext.c
+++ /dev/null
@@ -1,805 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2005 - 2018 Red Hat, Inc.
- * Copyright (C) 2006 - 2008 Novell, Inc.
- */
-
-#include "nm-default.h"
-
-#include "nm-wifi-utils-wext.h"
-
-#include <sys/ioctl.h>
-#include <net/ethernet.h>
-#include <unistd.h>
-
-/* Hacks necessary to #include wireless.h; yay for WEXT */
-#ifndef __user
-    #define __user
-#endif
-#include <sys/types.h>
-#include <linux/types.h>
-#include <sys/socket.h>
-#include <linux/wireless.h>
-
-#include "nm-wifi-utils-private.h"
-#include "nm-utils.h"
-#include "platform/nm-platform-utils.h"
-#include "nm-core-internal.h"
-
-typedef struct {
-    NMWifiUtils       parent;
-    int               fd;
-    struct iw_quality max_qual;
-    gint8             num_freqs;
-    guint32           freqs[IW_MAX_FREQUENCIES];
-} NMWifiUtilsWext;
-
-typedef struct {
-    NMWifiUtilsClass parent;
-} NMWifiUtilsWextClass;
-
-G_DEFINE_TYPE(NMWifiUtilsWext, nm_wifi_utils_wext, NM_TYPE_WIFI_UTILS)
-
-/* Until a new wireless-tools comes out that has the defs and the structure,
- * need to copy them here.
- */
-/* Scan capability flags - in (struct iw_range *)->scan_capa */
-#define NM_IW_SCAN_CAPA_NONE  0x00
-#define NM_IW_SCAN_CAPA_ESSID 0x01
-
-struct iw_range_with_scan_capa {
-    guint32 throughput;
-    guint32 min_nwid;
-    guint32 max_nwid;
-    guint16 old_num_channels;
-    guint8  old_num_frequency;
-
-    guint8 scan_capa;
-    /* don't need the rest... */
-};
-
-#define _NMLOG_PREFIX_NAME "wifi-wext"
-#define _NMLOG(level, domain, ...)                                    \
-    G_STMT_START                                                      \
-    {                                                                 \
-        nm_log((level),                                               \
-               (domain),                                              \
-               NULL,                                                  \
-               NULL,                                                  \
-               "%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__),             \
-               _NMLOG_PREFIX_NAME _NM_UTILS_MACRO_REST(__VA_ARGS__)); \
-    }                                                                 \
-    G_STMT_END
-
-static guint32
-iw_freq_to_uint32(const struct iw_freq *freq)
-{
-    if (freq->e == 0) {
-        /* Some drivers report channel not frequency.  Convert to a
-         * frequency; but this assumes that the device is in b/g mode.
-         */
-        if ((freq->m >= 1) && (freq->m <= 13))
-            return 2407 + (5 * freq->m);
-        else if (freq->m == 14)
-            return 2484;
-    }
-    return (guint32)((((double) freq->m) * nm_utils_exp10(freq->e)) / 1000000.0);
-}
-
-static void
-dispose(GObject *object)
-{
-    NMWifiUtilsWext *wext = NM_WIFI_UTILS_WEXT(object);
-
-    wext->fd = nm_close(wext->fd);
-}
-
-static gboolean
-get_ifname(int ifindex, char *buffer, const char *op)
-{
-    int errsv;
-
-    if (!nmp_utils_if_indextoname(ifindex, buffer)) {
-        errsv = errno;
-        _LOGW(LOGD_PLATFORM | LOGD_WIFI,
-              "error getting interface name for ifindex %d, operation '%s': %s (%d)",
-              ifindex,
-              op,
-              nm_strerror_native(errsv),
-              errsv);
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-static NM80211Mode
-wifi_wext_get_mode_ifname(NMWifiUtils *data, const char *ifname)
-{
-    NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data;
-    struct iwreq     wrq;
-    int              errsv;
-
-    memset(&wrq, 0, sizeof(struct iwreq));
-    nm_utils_ifname_cpy(wrq.ifr_name, ifname);
-
-    if (ioctl(wext->fd, SIOCGIWMODE, &wrq) < 0) {
-        errsv = errno;
-        if (errsv != ENODEV) {
-            _LOGW(LOGD_PLATFORM | LOGD_WIFI, "(%s): error %d getting card mode", ifname, errsv);
-        }
-        return NM_802_11_MODE_UNKNOWN;
-    }
-
-    switch (wrq.u.mode) {
-    case IW_MODE_ADHOC:
-        return NM_802_11_MODE_ADHOC;
-    case IW_MODE_MASTER:
-        return NM_802_11_MODE_AP;
-    case IW_MODE_INFRA:
-    case IW_MODE_AUTO: /* hack for WEXT devices reporting IW_MODE_AUTO */
-        return NM_802_11_MODE_INFRA;
-    default:
-        break;
-    }
-    return NM_802_11_MODE_UNKNOWN;
-}
-
-static NM80211Mode
-wifi_wext_get_mode(NMWifiUtils *data)
-{
-    char ifname[IFNAMSIZ];
-
-    if (!get_ifname(data->ifindex, ifname, "get-mode"))
-        return FALSE;
-
-    return wifi_wext_get_mode_ifname(data, ifname);
-}
-
-static gboolean
-wifi_wext_set_mode(NMWifiUtils *data, const NM80211Mode mode)
-{
-    NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data;
-    struct iwreq     wrq;
-    char             ifname[IFNAMSIZ];
-
-    if (!get_ifname(data->ifindex, ifname, "set-mode"))
-        return FALSE;
-
-    if (wifi_wext_get_mode_ifname(data, ifname) == mode)
-        return TRUE;
-
-    memset(&wrq, 0, sizeof(struct iwreq));
-    switch (mode) {
-    case NM_802_11_MODE_ADHOC:
-        wrq.u.mode = IW_MODE_ADHOC;
-        break;
-    case NM_802_11_MODE_AP:
-        wrq.u.mode = IW_MODE_MASTER;
-        break;
-    case NM_802_11_MODE_INFRA:
-        wrq.u.mode = IW_MODE_INFRA;
-        break;
-    default:
-        g_warn_if_reached();
-        return FALSE;
-    }
-
-    nm_utils_ifname_cpy(wrq.ifr_name, ifname);
-    if (ioctl(wext->fd, SIOCSIWMODE, &wrq) < 0) {
-        if (errno != ENODEV) {
-            _LOGE(LOGD_PLATFORM | LOGD_WIFI, "(%s): error setting mode %d", ifname, mode);
-        }
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-static gboolean
-wifi_wext_set_powersave(NMWifiUtils *data, guint32 powersave)
-{
-    NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data;
-    struct iwreq     wrq;
-    char             ifname[IFNAMSIZ];
-
-    if (!get_ifname(data->ifindex, ifname, "set-powersave"))
-        return FALSE;
-
-    memset(&wrq, 0, sizeof(struct iwreq));
-    if (powersave == 1) {
-        wrq.u.power.flags = IW_POWER_ALL_R;
-    } else
-        wrq.u.power.disabled = 1;
-
-    nm_utils_ifname_cpy(wrq.ifr_name, ifname);
-    if (ioctl(wext->fd, SIOCSIWPOWER, &wrq) < 0) {
-        if (errno != ENODEV) {
-            _LOGE(LOGD_PLATFORM | LOGD_WIFI,
-                  "(%s): error setting powersave %" G_GUINT32_FORMAT,
-                  ifname,
-                  powersave);
-        }
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-static guint32
-wifi_wext_get_freq(NMWifiUtils *data)
-{
-    NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data;
-    struct iwreq     wrq;
-    char             ifname[IFNAMSIZ];
-
-    if (!get_ifname(data->ifindex, ifname, "get-freq"))
-        return FALSE;
-
-    memset(&wrq, 0, sizeof(struct iwreq));
-    nm_utils_ifname_cpy(wrq.ifr_name, ifname);
-    if (ioctl(wext->fd, SIOCGIWFREQ, &wrq) < 0) {
-        _LOGW(LOGD_PLATFORM | LOGD_WIFI,
-              "(%s): error getting frequency: %s",
-              ifname,
-              nm_strerror_native(errno));
-        return 0;
-    }
-
-    return iw_freq_to_uint32(&wrq.u.freq);
-}
-
-static guint32
-wifi_wext_find_freq(NMWifiUtils *data, const guint32 *freqs)
-{
-    NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data;
-    int              i;
-
-    for (i = 0; i < wext->num_freqs; i++) {
-        while (*freqs) {
-            if (wext->freqs[i] == *freqs)
-                return *freqs;
-            freqs++;
-        }
-    }
-    return 0;
-}
-
-static gboolean
-wifi_wext_get_bssid(NMWifiUtils *data, guint8 *out_bssid)
-{
-    NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data;
-    struct iwreq     wrq;
-    char             ifname[IFNAMSIZ];
-
-    if (!get_ifname(data->ifindex, ifname, "get-bssid"))
-        return FALSE;
-
-    memset(&wrq, 0, sizeof(wrq));
-    nm_utils_ifname_cpy(wrq.ifr_name, ifname);
-    if (ioctl(wext->fd, SIOCGIWAP, &wrq) < 0) {
-        _LOGW(LOGD_PLATFORM | LOGD_WIFI,
-              "(%s): error getting associated BSSID: %s",
-              ifname,
-              nm_strerror_native(errno));
-        return FALSE;
-    }
-    memcpy(out_bssid, &(wrq.u.ap_addr.sa_data), ETH_ALEN);
-    return TRUE;
-}
-
-static guint32
-wifi_wext_get_rate(NMWifiUtils *data)
-{
-    NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data;
-    struct iwreq     wrq;
-    int              err;
-    char             ifname[IFNAMSIZ];
-
-    if (!get_ifname(data->ifindex, ifname, "get-rate"))
-        return FALSE;
-
-    memset(&wrq, 0, sizeof(wrq));
-    nm_utils_ifname_cpy(wrq.ifr_name, ifname);
-    err = ioctl(wext->fd, SIOCGIWRATE, &wrq);
-    return ((err == 0) ? wrq.u.bitrate.value / 1000 : 0);
-}
-
-static int
-wext_qual_to_percent(const struct iw_quality *qual, const struct iw_quality *max_qual)
-{
-    int percent       = -1;
-    int level_percent = -1;
-
-    g_return_val_if_fail(qual != NULL, -1);
-    g_return_val_if_fail(max_qual != NULL, -1);
-
-    /* Magically convert the many different WEXT quality representations to a percentage */
-
-    _LOGD(LOGD_WIFI,
-          "QL: qual %d/%u/0x%X, level %d/%u/0x%X, noise %d/%u/0x%X, updated: 0x%X  ** MAX: qual "
-          "%d/%u/0x%X, level %d/%u/0x%X, noise %d/%u/0x%X, updated: 0x%X",
-          (__s8) qual->qual,
-          qual->qual,
-          qual->qual,
-          (__s8) qual->level,
-          qual->level,
-          qual->level,
-          (__s8) qual->noise,
-          qual->noise,
-          qual->noise,
-          qual->updated,
-          (__s8) max_qual->qual,
-          max_qual->qual,
-          max_qual->qual,
-          (__s8) max_qual->level,
-          max_qual->level,
-          max_qual->level,
-          (__s8) max_qual->noise,
-          max_qual->noise,
-          max_qual->noise,
-          max_qual->updated);
-
-    /* Try using the card's idea of the signal quality first as long as it tells us what the max quality is.
-     * Drivers that fill in quality values MUST treat them as percentages, ie the "Link Quality" MUST be
-     * bounded by 0 and max_qual->qual, and MUST change in a linear fashion.  Within those bounds, drivers
-     * are free to use whatever they want to calculate "Link Quality".
-     */
-    if ((max_qual->qual != 0) && !(max_qual->updated & IW_QUAL_QUAL_INVALID)
-        && !(qual->updated & IW_QUAL_QUAL_INVALID))
-        percent = (int) (100 * ((double) qual->qual / (double) max_qual->qual));
-
-    /* If the driver doesn't specify a complete and valid quality, we have two options:
-     *
-     * 1) dBm: driver must specify max_qual->level = 0, and have valid values for
-     *        qual->level and (qual->noise OR max_qual->noise)
-     * 2) raw RSSI: driver must specify max_qual->level > 0, and have valid values for
-     *        qual->level and max_qual->level
-     *
-     * This is the WEXT spec.  If this interpretation is wrong, I'll fix it.  Otherwise,
-     * If drivers don't conform to it, they are wrong and need to be fixed.
-     */
-
-    if ((max_qual->level == 0)
-        && !(max_qual->updated & IW_QUAL_LEVEL_INVALID) /* Valid max_qual->level == 0 */
-        && !(qual->updated & IW_QUAL_LEVEL_INVALID)     /* Must have valid qual->level */
-        && (((max_qual->noise > 0)
-             && !(max_qual->updated & IW_QUAL_NOISE_INVALID)) /* Must have valid max_qual->noise */
-            || ((qual->noise > 0)
-                && !(qual->updated & IW_QUAL_NOISE_INVALID))) /*    OR valid qual->noise */
-    ) {
-/* Absolute power values (dBm) */
-
-/* Reasonable fallbacks for dumb drivers that don't specify either level. */
-#define FALLBACK_NOISE_FLOOR_DBM -90
-#define FALLBACK_SIGNAL_MAX_DBM  -20
-        int max_level = FALLBACK_SIGNAL_MAX_DBM;
-        int noise     = FALLBACK_NOISE_FLOOR_DBM;
-        int level     = qual->level - 0x100;
-
-        level = CLAMP(level, FALLBACK_NOISE_FLOOR_DBM, FALLBACK_SIGNAL_MAX_DBM);
-
-        if ((qual->noise > 0) && !(qual->updated & IW_QUAL_NOISE_INVALID))
-            noise = qual->noise - 0x100;
-        else if ((max_qual->noise > 0) && !(max_qual->updated & IW_QUAL_NOISE_INVALID))
-            noise = max_qual->noise - 0x100;
-        noise = CLAMP(noise, FALLBACK_NOISE_FLOOR_DBM, FALLBACK_SIGNAL_MAX_DBM - 1);
-
-        /* A sort of signal-to-noise ratio calculation */
-        level_percent = (int) (100
-                               - 70
-                                     * (((double) max_level - (double) level)
-                                        / ((double) max_level - (double) noise)));
-        _LOGD(LOGD_WIFI,
-              "QL1: level_percent is %d.  max_level %d, level %d, noise_floor %d.",
-              level_percent,
-              max_level,
-              level,
-              noise);
-    } else if ((max_qual->level != 0)
-               && !(max_qual->updated
-                    & IW_QUAL_LEVEL_INVALID) /* Valid max_qual->level as upper bound */
-               && !(qual->updated & IW_QUAL_LEVEL_INVALID)) {
-        /* Relative power values (RSSI) */
-
-        int level = qual->level;
-
-        /* Signal level is relavtive (0 -> max_qual->level) */
-        level         = CLAMP(level, 0, max_qual->level);
-        level_percent = (int) (100 * ((double) level / (double) max_qual->level));
-        _LOGD(LOGD_WIFI,
-              "QL2: level_percent is %d.  max_level %d, level %d.",
-              level_percent,
-              max_qual->level,
-              level);
-    } else if (percent == -1) {
-        _LOGD(LOGD_WIFI,
-              "QL: Could not get quality %% value from driver.  Driver is probably buggy.");
-    }
-
-    /* If the quality percent was 0 or doesn't exist, then try to use signal levels instead */
-    if ((percent < 1) && (level_percent >= 0))
-        percent = level_percent;
-
-    _LOGD(LOGD_WIFI, "QL: Final quality percent is %d (%d).", percent, CLAMP(percent, 0, 100));
-    return (CLAMP(percent, 0, 100));
-}
-
-static int
-wifi_wext_get_qual(NMWifiUtils *data)
-{
-    NMWifiUtilsWext *    wext = (NMWifiUtilsWext *) data;
-    struct iwreq         wrq;
-    struct iw_statistics stats;
-    char                 ifname[IFNAMSIZ];
-
-    if (!get_ifname(data->ifindex, ifname, "get-qual"))
-        return FALSE;
-
-    memset(&stats, 0, sizeof(stats));
-    wrq.u.data.pointer = &stats;
-    wrq.u.data.length  = sizeof(stats);
-    wrq.u.data.flags   = 1; /* Clear updated flag */
-    nm_utils_ifname_cpy(wrq.ifr_name, ifname);
-
-    if (ioctl(wext->fd, SIOCGIWSTATS, &wrq) < 0) {
-        _LOGW(LOGD_PLATFORM | LOGD_WIFI,
-              "(%s): error getting signal strength: %s",
-              ifname,
-              nm_strerror_native(errno));
-        return -1;
-    }
-
-    return wext_qual_to_percent(&stats.qual, &wext->max_qual);
-}
-
-/*****************************************************************************/
-/* OLPC Mesh-only functions */
-
-static guint32
-wifi_wext_get_mesh_channel(NMWifiUtils *data)
-{
-    NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data;
-    guint32          freq;
-    int              i;
-
-    freq = nm_wifi_utils_get_freq(data);
-    for (i = 0; i < wext->num_freqs; i++) {
-        if (freq == wext->freqs[i])
-            return i + 1;
-    }
-    return 0;
-}
-
-static gboolean
-wifi_wext_set_mesh_channel(NMWifiUtils *data, guint32 channel)
-{
-    NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data;
-    struct iwreq     wrq;
-    char             ifname[IFNAMSIZ];
-
-    if (!get_ifname(data->ifindex, ifname, "set-mesh-channel"))
-        return FALSE;
-
-    memset(&wrq, 0, sizeof(struct iwreq));
-    nm_utils_ifname_cpy(wrq.ifr_name, ifname);
-
-    if (channel > 0) {
-        wrq.u.freq.flags = IW_FREQ_FIXED;
-        wrq.u.freq.e     = 0;
-        wrq.u.freq.m     = channel;
-    }
-
-    if (ioctl(wext->fd, SIOCSIWFREQ, &wrq) < 0) {
-        _LOGE(LOGD_PLATFORM | LOGD_WIFI | LOGD_OLPC,
-              "(%s): error setting channel to %d: %s",
-              ifname,
-              channel,
-              nm_strerror_native(errno));
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-static gboolean
-wifi_wext_set_mesh_ssid(NMWifiUtils *data, const guint8 *ssid, gsize len)
-{
-    NMWifiUtilsWext *wext = (NMWifiUtilsWext *) data;
-    struct iwreq     wrq;
-    char             buf[IW_ESSID_MAX_SIZE + 1];
-    char             ifname[IFNAMSIZ];
-    int              errsv;
-
-    if (!get_ifname(data->ifindex, ifname, "set-mesh-ssid"))
-        return FALSE;
-
-    memset(buf, 0, sizeof(buf));
-    memcpy(buf, ssid, MIN(sizeof(buf) - 1, len));
-
-    wrq.u.essid.pointer = (caddr_t) buf;
-    wrq.u.essid.length  = len;
-    wrq.u.essid.flags   = (len > 0) ? 1 : 0; /* 1=enable SSID, 0=disable/any */
-
-    nm_utils_ifname_cpy(wrq.ifr_name, ifname);
-    if (ioctl(wext->fd, SIOCSIWESSID, &wrq) == 0)
-        return TRUE;
-
-    errsv = errno;
-    if (errsv != ENODEV) {
-        gs_free char *ssid_str = NULL;
-
-        _LOGE(LOGD_PLATFORM | LOGD_WIFI | LOGD_OLPC,
-              "(%s): error setting SSID to %s: %s",
-              ifname,
-              (ssid_str = _nm_utils_ssid_to_string_arr(ssid, len)),
-              nm_strerror_native(errsv));
-    }
-
-    return FALSE;
-}
-
-/*****************************************************************************/
-
-static gboolean
-wext_can_scan_ifname(NMWifiUtilsWext *wext, const char *ifname)
-{
-    struct iwreq wrq;
-
-    memset(&wrq, 0, sizeof(struct iwreq));
-    nm_utils_ifname_cpy(wrq.ifr_name, ifname);
-    if (ioctl(wext->fd, SIOCSIWSCAN, &wrq) < 0) {
-        if (errno == EOPNOTSUPP)
-            return FALSE;
-    }
-    return TRUE;
-}
-
-static gboolean
-wext_get_range_ifname(NMWifiUtilsWext *wext,
-                      const char *     ifname,
-                      struct iw_range *range,
-                      guint32 *        response_len)
-{
-    int          i       = 26;
-    gboolean     success = FALSE;
-    struct iwreq wrq;
-    int          errsv;
-
-    memset(&wrq, 0, sizeof(struct iwreq));
-    nm_utils_ifname_cpy(wrq.ifr_name, ifname);
-    wrq.u.data.pointer = (caddr_t) range;
-    wrq.u.data.length  = sizeof(struct iw_range);
-
-    /* Need to give some drivers time to recover after suspend/resume
-     * (ex ipw3945 takes a few seconds to talk to its regulatory daemon;
-     * see rh bz#362421)
-     */
-    while (i-- > 0) {
-        if (ioctl(wext->fd, SIOCGIWRANGE, &wrq) == 0) {
-            if (response_len)
-                *response_len = wrq.u.data.length;
-            success = TRUE;
-            break;
-        } else {
-            errsv = errno;
-            if (errsv != EAGAIN) {
-                _LOGE(LOGD_PLATFORM | LOGD_WIFI,
-                      "(%s): couldn't get driver range information (%d).",
-                      ifname,
-                      errsv);
-                break;
-            }
-        }
-
-        g_usleep(G_USEC_PER_SEC / 4);
-    }
-
-    if (i <= 0) {
-        _LOGW(LOGD_PLATFORM | LOGD_WIFI,
-              "(%s): driver took too long to respond to IWRANGE query.",
-              ifname);
-    }
-
-    return success;
-}
-
-#define WPA_CAPS                                                                              \
-    (NM_WIFI_DEVICE_CAP_CIPHER_TKIP | NM_WIFI_DEVICE_CAP_CIPHER_CCMP | NM_WIFI_DEVICE_CAP_WPA \
-     | NM_WIFI_DEVICE_CAP_RSN)
-
-static guint32
-wext_get_caps(NMWifiUtilsWext *wext, const char *ifname, struct iw_range *range)
-{
-    guint32 caps = NM_WIFI_DEVICE_CAP_NONE;
-
-    g_return_val_if_fail(wext != NULL, NM_WIFI_DEVICE_CAP_NONE);
-    g_return_val_if_fail(range != NULL, NM_WIFI_DEVICE_CAP_NONE);
-
-    /* All drivers should support WEP by default */
-    caps |= NM_WIFI_DEVICE_CAP_CIPHER_WEP40 | NM_WIFI_DEVICE_CAP_CIPHER_WEP104;
-
-    if (range->enc_capa & IW_ENC_CAPA_CIPHER_TKIP)
-        caps |= NM_WIFI_DEVICE_CAP_CIPHER_TKIP;
-
-    if (range->enc_capa & IW_ENC_CAPA_CIPHER_CCMP)
-        caps |= NM_WIFI_DEVICE_CAP_CIPHER_CCMP;
-
-    if (range->enc_capa & IW_ENC_CAPA_WPA)
-        caps |= NM_WIFI_DEVICE_CAP_WPA;
-
-    if (range->enc_capa & IW_ENC_CAPA_WPA2)
-        caps |= NM_WIFI_DEVICE_CAP_RSN;
-
-    /* Check for cipher support but not WPA support */
-    if ((caps & (NM_WIFI_DEVICE_CAP_CIPHER_TKIP | NM_WIFI_DEVICE_CAP_CIPHER_CCMP))
-        && !(caps & (NM_WIFI_DEVICE_CAP_WPA | NM_WIFI_DEVICE_CAP_RSN))) {
-        _LOGW(LOGD_WIFI,
-              "%s: device supports WPA ciphers but not WPA protocol; WPA unavailable.",
-              ifname);
-        caps &= ~WPA_CAPS;
-    }
-
-    /* Check for WPA support but not cipher support */
-    if ((caps & (NM_WIFI_DEVICE_CAP_WPA | NM_WIFI_DEVICE_CAP_RSN))
-        && !(caps & (NM_WIFI_DEVICE_CAP_CIPHER_TKIP | NM_WIFI_DEVICE_CAP_CIPHER_CCMP))) {
-        _LOGW(LOGD_WIFI,
-              "%s: device supports WPA protocol but not WPA ciphers; WPA unavailable.",
-              ifname);
-        caps &= ~WPA_CAPS;
-    }
-
-    /* There's no way to detect Ad-Hoc/AP mode support with WEXT
-     * (other than actually trying to do it), so just assume that
-     * Ad-Hoc is supported and AP isn't.
-     */
-    caps |= NM_WIFI_DEVICE_CAP_ADHOC;
-
-    return caps;
-}
-
-/*****************************************************************************/
-
-static void
-nm_wifi_utils_wext_init(NMWifiUtilsWext *self)
-{}
-
-static void
-nm_wifi_utils_wext_class_init(NMWifiUtilsWextClass *klass)
-{
-    GObjectClass *    object_class     = G_OBJECT_CLASS(klass);
-    NMWifiUtilsClass *wifi_utils_class = NM_WIFI_UTILS_CLASS(klass);
-
-    object_class->dispose = dispose;
-
-    wifi_utils_class->get_mode         = wifi_wext_get_mode;
-    wifi_utils_class->set_mode         = wifi_wext_set_mode;
-    wifi_utils_class->set_powersave    = wifi_wext_set_powersave;
-    wifi_utils_class->get_freq         = wifi_wext_get_freq;
-    wifi_utils_class->find_freq        = wifi_wext_find_freq;
-    wifi_utils_class->get_bssid        = wifi_wext_get_bssid;
-    wifi_utils_class->get_rate         = wifi_wext_get_rate;
-    wifi_utils_class->get_qual         = wifi_wext_get_qual;
-    wifi_utils_class->get_mesh_channel = wifi_wext_get_mesh_channel;
-    wifi_utils_class->set_mesh_channel = wifi_wext_set_mesh_channel;
-    wifi_utils_class->set_mesh_ssid    = wifi_wext_set_mesh_ssid;
-}
-
-NMWifiUtils *
-nm_wifi_utils_wext_new(int ifindex, gboolean check_scan)
-{
-    NMWifiUtilsWext *               wext;
-    struct iw_range                 range;
-    guint32                         response_len = 0;
-    struct iw_range_with_scan_capa *scan_capa_range;
-    int                             i;
-    gboolean                        freq_valid = FALSE, has_5ghz = FALSE, has_2ghz = FALSE;
-    char                            ifname[IFNAMSIZ];
-
-    if (!nmp_utils_if_indextoname(ifindex, ifname)) {
-        _LOGW(LOGD_PLATFORM | LOGD_WIFI, "can't determine interface name for ifindex %d", ifindex);
-        return NULL;
-    }
-
-    wext = g_object_new(NM_TYPE_WIFI_UTILS_WEXT, NULL);
-
-    wext->parent.ifindex = ifindex;
-    wext->fd             = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
-    if (wext->fd < 0)
-        goto error;
-
-    memset(&range, 0, sizeof(struct iw_range));
-    if (wext_get_range_ifname(wext, ifname, &range, &response_len) == FALSE) {
-        _LOGI(LOGD_PLATFORM | LOGD_WIFI, "(%s): driver WEXT range request failed", ifname);
-        goto error;
-    }
-
-    if ((response_len < 300) || (range.we_version_compiled < 21)) {
-        _LOGI(LOGD_PLATFORM | LOGD_WIFI,
-              "(%s): driver WEXT version too old (got %d, expected >= 21)",
-              ifname,
-              range.we_version_compiled);
-        goto error;
-    }
-
-    wext->max_qual.qual    = range.max_qual.qual;
-    wext->max_qual.level   = range.max_qual.level;
-    wext->max_qual.noise   = range.max_qual.noise;
-    wext->max_qual.updated = range.max_qual.updated;
-
-    wext->num_freqs = MIN(range.num_frequency, IW_MAX_FREQUENCIES);
-    for (i = 0; i < wext->num_freqs; i++) {
-        wext->freqs[i] = iw_freq_to_uint32(&range.freq[i]);
-        freq_valid     = TRUE;
-        if (wext->freqs[i] > 2400 && wext->freqs[i] < 2500)
-            has_2ghz = TRUE;
-        else if (wext->freqs[i] > 4900 && wext->freqs[i] < 6000)
-            has_5ghz = TRUE;
-    }
-
-    /* Check for scanning capability; cards that can't scan are not supported */
-    if (check_scan && (wext_can_scan_ifname(wext, ifname) == FALSE)) {
-        _LOGI(LOGD_PLATFORM | LOGD_WIFI, "(%s): drivers that cannot scan are unsupported", ifname);
-        goto error;
-    }
-
-    /* Check for the ability to scan specific SSIDs.  Until the scan_capa
-     * field gets added to wireless-tools, need to work around that by casting
-     * to the custom structure.
-     */
-    scan_capa_range = (struct iw_range_with_scan_capa *) &range;
-    if (scan_capa_range->scan_capa & NM_IW_SCAN_CAPA_ESSID) {
-        _LOGI(LOGD_PLATFORM | LOGD_WIFI,
-              "(%s): driver supports SSID scans (scan_capa 0x%02X).",
-              ifname,
-              scan_capa_range->scan_capa);
-    } else {
-        _LOGI(LOGD_PLATFORM | LOGD_WIFI,
-              "(%s): driver does not support SSID scans (scan_capa 0x%02X).",
-              ifname,
-              scan_capa_range->scan_capa);
-    }
-
-    wext->parent.caps = wext_get_caps(wext, ifname, &range);
-    if (freq_valid)
-        wext->parent.caps |= NM_WIFI_DEVICE_CAP_FREQ_VALID;
-    if (has_2ghz)
-        wext->parent.caps |= NM_WIFI_DEVICE_CAP_FREQ_2GHZ;
-    if (has_5ghz)
-        wext->parent.caps |= NM_WIFI_DEVICE_CAP_FREQ_5GHZ;
-
-    _LOGI(LOGD_PLATFORM | LOGD_WIFI, "(%s): using WEXT for Wi-Fi device control", ifname);
-
-    return (NMWifiUtils *) wext;
-
-error:
-    g_object_unref(wext);
-    return NULL;
-}
-
-gboolean
-nm_wifi_utils_wext_is_wifi(const char *iface)
-{
-    int          fd;
-    struct iwreq iwr;
-    gboolean     is_wifi = FALSE;
-
-    /* performing an ioctl on a non-existing name may cause the automatic
-     * loading of kernel modules, which should be avoided.
-     *
-     * Usually, we should thus make sure that an interface with this name
-     * exists.
-     *
-     * Note that wifi_wext_is_wifi() has only one caller which just verified
-     * that an interface with this name exists.
-     */
-
-    fd = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
-    if (fd >= 0) {
-        nm_utils_ifname_cpy(iwr.ifr_ifrn.ifrn_name, iface);
-        if (ioctl(fd, SIOCGIWNAME, &iwr) == 0)
-            is_wifi = TRUE;
-        nm_close(fd);
-    }
-    return is_wifi;
-}
diff --git a/src/platform/wifi/nm-wifi-utils-wext.h b/src/platform/wifi/nm-wifi-utils-wext.h
deleted file mode 100644
index 210b87e5..00000000
--- a/src/platform/wifi/nm-wifi-utils-wext.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2011 - 2018 Red Hat, Inc.
- */
-
-#ifndef __WIFI_UTILS_WEXT_H__
-#define __WIFI_UTILS_WEXT_H__
-
-#include "nm-wifi-utils.h"
-
-#define NM_TYPE_WIFI_UTILS_WEXT (nm_wifi_utils_wext_get_type())
-#define NM_WIFI_UTILS_WEXT(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_WIFI_UTILS_WEXT, NMWifiUtilsWext))
-#define NM_WIFI_UTILS_WEXT_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_WIFI_UTILS_WEXT, NMWifiUtilsWextClass))
-#define NM_IS_WIFI_UTILS_WEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_WIFI_UTILS_WEXT))
-#define NM_IS_WIFI_UTILS_WEXT_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_WIFI_UTILS_WEXT))
-#define NM_WIFI_UTILS_WEXT_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_WIFI_UTILS_WEXT, NMWifiUtilsWextClass))
-
-GType nm_wifi_utils_wext_get_type(void);
-
-NMWifiUtils *nm_wifi_utils_wext_new(int ifindex, gboolean check_scan);
-
-gboolean nm_wifi_utils_wext_is_wifi(const char *iface);
-
-#endif /* __WIFI_UTILS_WEXT_H__ */
diff --git a/src/platform/wifi/nm-wifi-utils.c b/src/platform/wifi/nm-wifi-utils.c
deleted file mode 100644
index 3f9d3a48..00000000
--- a/src/platform/wifi/nm-wifi-utils.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2005 - 2018 Red Hat, Inc.
- * Copyright (C) 2006 - 2008 Novell, Inc.
- */
-
-#include "nm-default.h"
-
-#include "nm-wifi-utils.h"
-
-#include <sys/stat.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#include "nm-wifi-utils-private.h"
-#include "nm-wifi-utils-nl80211.h"
-#if HAVE_WEXT
-    #include "nm-wifi-utils-wext.h"
-#endif
-#include "nm-core-utils.h"
-
-#include "platform/nm-platform-utils.h"
-
-G_DEFINE_ABSTRACT_TYPE(NMWifiUtils, nm_wifi_utils, G_TYPE_OBJECT)
-
-/*****************************************************************************/
-
-static void
-nm_wifi_utils_init(NMWifiUtils *self)
-{}
-
-static void
-nm_wifi_utils_class_init(NMWifiUtilsClass *klass)
-{}
-
-NMWifiUtils *
-nm_wifi_utils_new(int ifindex, struct nl_sock *genl, gboolean check_scan)
-{
-    NMWifiUtils *ret;
-
-    g_return_val_if_fail(ifindex > 0, NULL);
-
-    ret = nm_wifi_utils_nl80211_new(ifindex, genl);
-
-#if HAVE_WEXT
-    if (ret == NULL)
-        ret = nm_wifi_utils_wext_new(ifindex, check_scan);
-#endif
-
-    return ret;
-}
-
-NMDeviceWifiCapabilities
-nm_wifi_utils_get_caps(NMWifiUtils *data)
-{
-    g_return_val_if_fail(data != NULL, NM_WIFI_DEVICE_CAP_NONE);
-
-    return data->caps;
-}
-
-NM80211Mode
-nm_wifi_utils_get_mode(NMWifiUtils *data)
-{
-    g_return_val_if_fail(data != NULL, NM_802_11_MODE_UNKNOWN);
-    return NM_WIFI_UTILS_GET_CLASS(data)->get_mode(data);
-}
-
-gboolean
-nm_wifi_utils_set_mode(NMWifiUtils *data, const NM80211Mode mode)
-{
-    NMWifiUtilsClass *klass;
-
-    g_return_val_if_fail(data != NULL, FALSE);
-    g_return_val_if_fail((mode == NM_802_11_MODE_INFRA) || (mode == NM_802_11_MODE_AP)
-                             || (mode == NM_802_11_MODE_ADHOC) || (mode == NM_802_11_MODE_MESH),
-                         FALSE);
-
-    klass = NM_WIFI_UTILS_GET_CLASS(data);
-
-    /* nl80211 probably doesn't need this */
-    return klass->set_mode ? klass->set_mode(data, mode) : TRUE;
-}
-
-gboolean
-nm_wifi_utils_set_powersave(NMWifiUtils *data, guint32 powersave)
-{
-    NMWifiUtilsClass *klass;
-
-    g_return_val_if_fail(data != NULL, FALSE);
-
-    klass = NM_WIFI_UTILS_GET_CLASS(data);
-    return klass->set_powersave ? klass->set_powersave(data, powersave) : TRUE;
-}
-
-NMSettingWirelessWakeOnWLan
-nm_wifi_utils_get_wake_on_wlan(NMWifiUtils *data)
-{
-    NMWifiUtilsClass *klass;
-
-    g_return_val_if_fail(data != NULL, NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE);
-
-    klass = NM_WIFI_UTILS_GET_CLASS(data);
-
-    return klass->get_wake_on_wlan ? klass->get_wake_on_wlan(data)
-                                   : NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE;
-}
-
-gboolean
-nm_wifi_utils_set_wake_on_wlan(NMWifiUtils *data, NMSettingWirelessWakeOnWLan wowl)
-{
-    NMWifiUtilsClass *klass;
-
-    g_return_val_if_fail(data != NULL, FALSE);
-
-    klass = NM_WIFI_UTILS_GET_CLASS(data);
-    return klass->set_wake_on_wlan ? klass->set_wake_on_wlan(data, wowl) : FALSE;
-}
-
-guint32
-nm_wifi_utils_get_freq(NMWifiUtils *data)
-{
-    g_return_val_if_fail(data != NULL, 0);
-    return NM_WIFI_UTILS_GET_CLASS(data)->get_freq(data);
-}
-
-guint32
-nm_wifi_utils_find_freq(NMWifiUtils *data, const guint32 *freqs)
-{
-    g_return_val_if_fail(data != NULL, 0);
-    g_return_val_if_fail(freqs != NULL, 0);
-    return NM_WIFI_UTILS_GET_CLASS(data)->find_freq(data, freqs);
-}
-
-gboolean
-nm_wifi_utils_get_bssid(NMWifiUtils *data, guint8 *out_bssid)
-{
-    g_return_val_if_fail(data != NULL, FALSE);
-    g_return_val_if_fail(out_bssid != NULL, FALSE);
-
-    memset(out_bssid, 0, ETH_ALEN);
-    return NM_WIFI_UTILS_GET_CLASS(data)->get_bssid(data, out_bssid);
-}
-
-guint32
-nm_wifi_utils_get_rate(NMWifiUtils *data)
-{
-    g_return_val_if_fail(data != NULL, 0);
-    return NM_WIFI_UTILS_GET_CLASS(data)->get_rate(data);
-}
-
-int
-nm_wifi_utils_get_qual(NMWifiUtils *data)
-{
-    g_return_val_if_fail(data != NULL, 0);
-    return NM_WIFI_UTILS_GET_CLASS(data)->get_qual(data);
-}
-
-gboolean
-nm_wifi_utils_is_wifi(int dirfd, const char *ifname)
-{
-    g_return_val_if_fail(dirfd >= 0, FALSE);
-
-    if (faccessat(dirfd, "phy80211", F_OK, 0) == 0)
-        return TRUE;
-#if HAVE_WEXT
-    if (nm_wifi_utils_wext_is_wifi(ifname))
-        return TRUE;
-#endif
-    return FALSE;
-}
-
-/* OLPC Mesh-only functions */
-
-guint32
-nm_wifi_utils_get_mesh_channel(NMWifiUtils *data)
-{
-    NMWifiUtilsClass *klass;
-
-    g_return_val_if_fail(data != NULL, FALSE);
-
-    klass = NM_WIFI_UTILS_GET_CLASS(data);
-    g_return_val_if_fail(klass->get_mesh_channel != NULL, FALSE);
-
-    return klass->get_mesh_channel(data);
-}
-
-gboolean
-nm_wifi_utils_set_mesh_channel(NMWifiUtils *data, guint32 channel)
-{
-    NMWifiUtilsClass *klass;
-
-    g_return_val_if_fail(data != NULL, FALSE);
-    g_return_val_if_fail(channel <= 13, FALSE);
-
-    klass = NM_WIFI_UTILS_GET_CLASS(data);
-    g_return_val_if_fail(klass->set_mesh_channel != NULL, FALSE);
-
-    return klass->set_mesh_channel(data, channel);
-}
-
-gboolean
-nm_wifi_utils_set_mesh_ssid(NMWifiUtils *data, const guint8 *ssid, gsize len)
-{
-    NMWifiUtilsClass *klass;
-
-    g_return_val_if_fail(data != NULL, FALSE);
-
-    klass = NM_WIFI_UTILS_GET_CLASS(data);
-    g_return_val_if_fail(klass->set_mesh_ssid != NULL, FALSE);
-
-    return klass->set_mesh_ssid(data, ssid, len);
-}
-
-gboolean
-nm_wifi_utils_indicate_addressing_running(NMWifiUtils *data, gboolean running)
-{
-    NMWifiUtilsClass *klass;
-
-    g_return_val_if_fail(data != NULL, FALSE);
-
-    klass = NM_WIFI_UTILS_GET_CLASS(data);
-    return klass->indicate_addressing_running ? klass->indicate_addressing_running(data, running)
-                                              : FALSE;
-}
diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils.h
deleted file mode 100644
index d1df2fb8..00000000
--- a/src/platform/wifi/nm-wifi-utils.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2005 - 2018 Red Hat, Inc.
- * Copyright (C) 2006 - 2008 Novell, Inc.
- */
-
-#ifndef __WIFI_UTILS_H__
-#define __WIFI_UTILS_H__
-
-#include <net/ethernet.h>
-
-#include "nm-dbus-interface.h"
-#include "nm-setting-wireless.h"
-#include "platform/nm-netlink.h"
-
-typedef struct NMWifiUtils NMWifiUtils;
-
-#define NM_TYPE_WIFI_UTILS (nm_wifi_utils_get_type())
-#define NM_WIFI_UTILS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_WIFI_UTILS, NMWifiUtils))
-#define NM_WIFI_UTILS_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_WIFI_UTILS, NMWifiUtilsClass))
-#define NM_IS_WIFI_UTILS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_WIFI_UTILS))
-#define NM_IS_WIFI_UTILS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_WIFI_UTILS))
-#define NM_WIFI_UTILS_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_WIFI_UTILS, NMWifiUtilsClass))
-
-GType nm_wifi_utils_get_type(void);
-
-gboolean nm_wifi_utils_is_wifi(int dirfd, const char *ifname);
-
-NMWifiUtils *nm_wifi_utils_new(int ifindex, struct nl_sock *genl, gboolean check_scan);
-
-NMDeviceWifiCapabilities nm_wifi_utils_get_caps(NMWifiUtils *data);
-
-NM80211Mode nm_wifi_utils_get_mode(NMWifiUtils *data);
-
-gboolean nm_wifi_utils_set_mode(NMWifiUtils *data, const NM80211Mode mode);
-
-/* Returns frequency in MHz */
-guint32 nm_wifi_utils_get_freq(NMWifiUtils *data);
-
-/* Return the first supported frequency in the zero-terminated list.
- * Frequencies are specified in MHz. */
-guint32 nm_wifi_utils_find_freq(NMWifiUtils *data, const guint32 *freqs);
-
-/* out_bssid must be ETH_ALEN bytes */
-gboolean nm_wifi_utils_get_bssid(NMWifiUtils *data, guint8 *out_bssid);
-
-/* Returns current bitrate in Kbps */
-guint32 nm_wifi_utils_get_rate(NMWifiUtils *data);
-
-/* Returns quality 0 - 100% on success, or -1 on error */
-int nm_wifi_utils_get_qual(NMWifiUtils *data);
-
-/* Tells the driver DHCP or SLAAC is running */
-gboolean nm_wifi_utils_indicate_addressing_running(NMWifiUtils *data, gboolean running);
-
-gboolean nm_wifi_utils_set_powersave(NMWifiUtils *data, guint32 powersave);
-
-NMSettingWirelessWakeOnWLan nm_wifi_utils_get_wake_on_wlan(NMWifiUtils *data);
-
-gboolean nm_wifi_utils_set_wake_on_wlan(NMWifiUtils *data, NMSettingWirelessWakeOnWLan wowl);
-
-/* OLPC Mesh-only functions */
-guint32 nm_wifi_utils_get_mesh_channel(NMWifiUtils *data);
-
-gboolean nm_wifi_utils_set_mesh_channel(NMWifiUtils *data, guint32 channel);
-
-gboolean nm_wifi_utils_set_mesh_ssid(NMWifiUtils *data, const guint8 *ssid, gsize len);
-
-#endif /* __WIFI_UTILS_H__ */