From a5865cef1a4cb290cf37b70f8876338bbd3c13d3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 3 Mar 2021 17:32:50 +0100 Subject: [PATCH] core: use _NMDeviceWifiCapabilities instead of NMDeviceWifiCapabilities --- src/core/devices/wifi/nm-device-iwd.c | 16 ++++---- src/core/devices/wifi/nm-device-wifi.c | 14 +++---- src/core/devices/wifi/nm-device-wifi.h | 2 +- src/core/devices/wifi/nm-wifi-factory.c | 6 +-- src/core/platform/nm-fake-platform.c | 10 ++--- src/core/platform/nm-linux-platform.c | 2 +- src/core/platform/nm-platform.c | 2 +- src/core/platform/nm-platform.h | 8 ++-- .../platform/wifi/nm-wifi-utils-nl80211.c | 22 +++++------ .../platform/wifi/nm-wifi-utils-private.h | 4 +- src/core/platform/wifi/nm-wifi-utils-wext.c | 38 +++++++++---------- src/core/platform/wifi/nm-wifi-utils.c | 4 +- src/core/platform/wifi/nm-wifi-utils.h | 2 +- 13 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/core/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c index d0aae5a5dd..dd6fd48d4b 100644 --- a/src/core/devices/wifi/nm-device-iwd.c +++ b/src/core/devices/wifi/nm-device-iwd.c @@ -55,7 +55,7 @@ typedef struct { CList aps_lst_head; NMWifiAP * current_ap; GCancellable * cancellable; - NMDeviceWifiCapabilities capabilities; + _NMDeviceWifiCapabilities capabilities; NMActRequestGetSecretsCallId *wifi_secrets_id; guint periodic_scan_id; guint periodic_update_id; @@ -801,7 +801,7 @@ check_connection_compatible(NMDevice *device, NMConnection *connection, GError * NMSettingWirelessSecurity *s_wireless_sec = nm_connection_get_setting_wireless_security(connection); - if (!(priv->capabilities & NM_WIFI_DEVICE_CAP_AP)) { + if (!(priv->capabilities & _NM_WIFI_DEVICE_CAP_AP)) { nm_utils_error_set_literal(error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_INCOMPATIBLE, "device does not support Access Point mode"); @@ -819,7 +819,7 @@ check_connection_compatible(NMDevice *device, NMConnection *connection, GError * NMSettingWirelessSecurity *s_wireless_sec = nm_connection_get_setting_wireless_security(connection); - if (!(priv->capabilities & NM_WIFI_DEVICE_CAP_ADHOC)) { + if (!(priv->capabilities & _NM_WIFI_DEVICE_CAP_ADHOC)) { nm_utils_error_set_literal(error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_INCOMPATIBLE, "device does not support Ad-Hoc mode"); @@ -3034,7 +3034,7 @@ nm_device_iwd_set_dbus_object(NMDeviceIwd *self, GDBusObject *object) GVariantIter * iter; const char * mode; gboolean powered; - NMDeviceWifiCapabilities capabilities; + _NMDeviceWifiCapabilities capabilities; if (!nm_g_object_ref_set(&priv->dbus_obj, object)) return; @@ -3096,14 +3096,14 @@ nm_device_iwd_set_dbus_object(NMDeviceIwd *self, GDBusObject *object) goto error; } - capabilities = NM_WIFI_DEVICE_CAP_CIPHER_CCMP | NM_WIFI_DEVICE_CAP_RSN; + capabilities = _NM_WIFI_DEVICE_CAP_CIPHER_CCMP | _NM_WIFI_DEVICE_CAP_RSN; g_variant_get(value, "as", &iter); while (g_variant_iter_next(iter, "&s", &mode)) { if (nm_streq(mode, "ap")) - capabilities |= NM_WIFI_DEVICE_CAP_AP; + capabilities |= _NM_WIFI_DEVICE_CAP_AP; else if (nm_streq(mode, "ad-hoc")) - capabilities |= NM_WIFI_DEVICE_CAP_ADHOC; + capabilities |= _NM_WIFI_DEVICE_CAP_ADHOC; } g_variant_iter_free(iter); @@ -3485,7 +3485,7 @@ nm_device_iwd_class_init(NMDeviceIwdClass *klass) "", 0, G_MAXUINT32, - NM_WIFI_DEVICE_CAP_NONE, + _NM_WIFI_DEVICE_CAP_NONE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); obj_properties[PROP_SCANNING] = g_param_spec_boolean(NM_DEVICE_IWD_SCANNING, diff --git a/src/core/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c index 661cd29e95..a6df55f69c 100644 --- a/src/core/devices/wifi/nm-device-wifi.c +++ b/src/core/devices/wifi/nm-device-wifi.c @@ -114,7 +114,7 @@ typedef struct { guint wps_timeout_id; guint sup_timeout_id; /* supplicant association timeout */ - NMDeviceWifiCapabilities capabilities; + _NMDeviceWifiCapabilities capabilities; _NMSettingWirelessWakeOnWLan wowlan_restore; NMDeviceWifiP2P *p2p_device; @@ -1010,14 +1010,14 @@ check_connection_compatible(NMDevice *device, NMConnection *connection, GError * /* Early exit if supplicant or device doesn't support requested mode */ mode = nm_setting_wireless_get_mode(s_wireless); if (g_strcmp0(mode, NM_SETTING_WIRELESS_MODE_ADHOC) == 0) { - if (!(priv->capabilities & NM_WIFI_DEVICE_CAP_ADHOC)) { + if (!(priv->capabilities & _NM_WIFI_DEVICE_CAP_ADHOC)) { nm_utils_error_set_literal(error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY, "the device does not support Ad-Hoc networks"); return FALSE; } } else if (g_strcmp0(mode, NM_SETTING_WIRELESS_MODE_AP) == 0) { - if (!(priv->capabilities & NM_WIFI_DEVICE_CAP_AP)) { + if (!(priv->capabilities & _NM_WIFI_DEVICE_CAP_AP)) { nm_utils_error_set_literal(error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY, "the device does not support Access Point mode"); @@ -1034,7 +1034,7 @@ check_connection_compatible(NMDevice *device, NMConnection *connection, GError * } } } else if (g_strcmp0(mode, NM_SETTING_WIRELESS_MODE_MESH) == 0) { - if (!(priv->capabilities & NM_WIFI_DEVICE_CAP_MESH)) { + if (!(priv->capabilities & _NM_WIFI_DEVICE_CAP_MESH)) { nm_utils_error_set_literal(error, NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY, "the device does not support Mesh mode"); @@ -3709,7 +3709,7 @@ constructed(GObject *object) G_OBJECT_CLASS(nm_device_wifi_parent_class)->constructed(object); - if (priv->capabilities & NM_WIFI_DEVICE_CAP_AP) + if (priv->capabilities & _NM_WIFI_DEVICE_CAP_AP) _LOGI(LOGD_PLATFORM | LOGD_WIFI, "driver supports Access Point (AP) mode"); /* Connect to the supplicant manager */ @@ -3717,7 +3717,7 @@ constructed(GObject *object) } NMDevice * -nm_device_wifi_new(const char *iface, NMDeviceWifiCapabilities capabilities) +nm_device_wifi_new(const char *iface, _NMDeviceWifiCapabilities capabilities) { return g_object_new(NM_TYPE_DEVICE_WIFI, NM_DEVICE_IFACE, @@ -3858,7 +3858,7 @@ nm_device_wifi_class_init(NMDeviceWifiClass *klass) "", 0, G_MAXUINT32, - NM_WIFI_DEVICE_CAP_NONE, + _NM_WIFI_DEVICE_CAP_NONE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); obj_properties[PROP_SCANNING] = g_param_spec_boolean(NM_DEVICE_WIFI_SCANNING, diff --git a/src/core/devices/wifi/nm-device-wifi.h b/src/core/devices/wifi/nm-device-wifi.h index d9e9038cc0..c7ff1a140a 100644 --- a/src/core/devices/wifi/nm-device-wifi.h +++ b/src/core/devices/wifi/nm-device-wifi.h @@ -33,7 +33,7 @@ typedef struct _NMDeviceWifiClass NMDeviceWifiClass; GType nm_device_wifi_get_type(void); -NMDevice *nm_device_wifi_new(const char *iface, NMDeviceWifiCapabilities capabilities); +NMDevice *nm_device_wifi_new(const char *iface, _NMDeviceWifiCapabilities capabilities); const CList *_nm_device_wifi_get_aps(NMDeviceWifi *self); diff --git a/src/core/devices/wifi/nm-wifi-factory.c b/src/core/devices/wifi/nm-wifi-factory.c index 40375e1c1f..ce43b18b90 100644 --- a/src/core/devices/wifi/nm-wifi-factory.c +++ b/src/core/devices/wifi/nm-wifi-factory.c @@ -97,9 +97,9 @@ create_device(NMDeviceFactory * factory, NM_PRINT_FMT_QUOTE_STRING(backend), WITH_IWD ? " (iwd support enabled)" : ""); if (!backend || !g_ascii_strcasecmp(backend, "wpa_supplicant")) { - NMDevice * device; - NMDeviceWifiCapabilities capabilities; - NM80211Mode mode; + NMDevice * device; + _NMDeviceWifiCapabilities capabilities; + NM80211Mode mode; if (!nm_platform_wifi_get_capabilities(NM_PLATFORM_GET, plink->ifindex, &capabilities)) { nm_log_warn(LOGD_PLATFORM | LOGD_WIFI, diff --git a/src/core/platform/nm-fake-platform.c b/src/core/platform/nm-fake-platform.c index 2eb3ae66d4..524f3b3ed7 100644 --- a/src/core/platform/nm-fake-platform.c +++ b/src/core/platform/nm-fake-platform.c @@ -819,7 +819,7 @@ infiniband_partition_delete(NMPlatform *platform, int parent, int p_key) } static gboolean -wifi_get_capabilities(NMPlatform *platform, int ifindex, NMDeviceWifiCapabilities *caps) +wifi_get_capabilities(NMPlatform *platform, int ifindex, _NMDeviceWifiCapabilities *caps) { NMFakePlatformLink *device = link_get(platform, ifindex); @@ -829,10 +829,10 @@ wifi_get_capabilities(NMPlatform *platform, int ifindex, NMDeviceWifiCapabilitie return FALSE; if (caps) { - *caps = (NM_WIFI_DEVICE_CAP_CIPHER_WEP40 | NM_WIFI_DEVICE_CAP_CIPHER_WEP104 - | NM_WIFI_DEVICE_CAP_CIPHER_TKIP | NM_WIFI_DEVICE_CAP_CIPHER_CCMP - | NM_WIFI_DEVICE_CAP_WPA | NM_WIFI_DEVICE_CAP_RSN | NM_WIFI_DEVICE_CAP_AP - | NM_WIFI_DEVICE_CAP_ADHOC); + *caps = (_NM_WIFI_DEVICE_CAP_CIPHER_WEP40 | _NM_WIFI_DEVICE_CAP_CIPHER_WEP104 + | _NM_WIFI_DEVICE_CAP_CIPHER_TKIP | _NM_WIFI_DEVICE_CAP_CIPHER_CCMP + | _NM_WIFI_DEVICE_CAP_WPA | _NM_WIFI_DEVICE_CAP_RSN | _NM_WIFI_DEVICE_CAP_AP + | _NM_WIFI_DEVICE_CAP_ADHOC); } return TRUE; } diff --git a/src/core/platform/nm-linux-platform.c b/src/core/platform/nm-linux-platform.c index 954d12bbad..17982583c3 100644 --- a/src/core/platform/nm-linux-platform.c +++ b/src/core/platform/nm-linux-platform.c @@ -8277,7 +8277,7 @@ get_ext_data(NMPlatform *platform, int ifindex) return retval; static gboolean -wifi_get_capabilities(NMPlatform *platform, int ifindex, NMDeviceWifiCapabilities *caps) +wifi_get_capabilities(NMPlatform *platform, int ifindex, _NMDeviceWifiCapabilities *caps) { WIFI_GET_WIFI_DATA_NETNS(wifi_data, platform, ifindex, FALSE); if (caps) diff --git a/src/core/platform/nm-platform.c b/src/core/platform/nm-platform.c index 57b6679f30..01177e1b0b 100644 --- a/src/core/platform/nm-platform.c +++ b/src/core/platform/nm-platform.c @@ -3044,7 +3044,7 @@ nm_platform_link_tun_get_properties(NMPlatform *self, int ifindex, NMPlatformLnk } gboolean -nm_platform_wifi_get_capabilities(NMPlatform *self, int ifindex, NMDeviceWifiCapabilities *caps) +nm_platform_wifi_get_capabilities(NMPlatform *self, int ifindex, _NMDeviceWifiCapabilities *caps) { _CHECK_SELF(self, klass, FALSE); diff --git a/src/core/platform/nm-platform.h b/src/core/platform/nm-platform.h index fe6f036d16..eadfed0d0b 100644 --- a/src/core/platform/nm-platform.h +++ b/src/core/platform/nm-platform.h @@ -1176,9 +1176,9 @@ typedef struct { const NMPlatformLink **out_link); gboolean (*infiniband_partition_delete)(NMPlatform *self, int parent, int p_key); - gboolean (*wifi_get_capabilities)(NMPlatform * self, - int ifindex, - NMDeviceWifiCapabilities *caps); + gboolean (*wifi_get_capabilities)(NMPlatform * self, + int ifindex, + _NMDeviceWifiCapabilities *caps); gboolean (*wifi_get_station)(NMPlatform * self, int ifindex, NMEtherAddr *out_bssid, @@ -1963,7 +1963,7 @@ gboolean nm_platform_link_tun_get_properties(NMPlatform * self, NMPlatformLnkTun *out_properties); gboolean -nm_platform_wifi_get_capabilities(NMPlatform *self, int ifindex, NMDeviceWifiCapabilities *caps); +nm_platform_wifi_get_capabilities(NMPlatform *self, int ifindex, _NMDeviceWifiCapabilities *caps); guint32 nm_platform_wifi_get_frequency(NMPlatform *self, int ifindex); gboolean nm_platform_wifi_get_station(NMPlatform * self, int ifindex, diff --git a/src/core/platform/wifi/nm-wifi-utils-nl80211.c b/src/core/platform/wifi/nm-wifi-utils-nl80211.c index 38f4dd747c..d55a8ac964 100644 --- a/src/core/platform/wifi/nm-wifi-utils-nl80211.c +++ b/src/core/platform/wifi/nm-wifi-utils-nl80211.c @@ -687,12 +687,12 @@ nl80211_wiphy_info_handler(struct nl_msg *msg, void *arg) info->freqs[freq_idx] = nla_get_u32(tb_freq[NL80211_FREQUENCY_ATTR_FREQ]); - info->caps |= NM_WIFI_DEVICE_CAP_FREQ_VALID; + 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; + 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; + info->caps |= _NM_WIFI_DEVICE_CAP_FREQ_5GHZ; freq_idx++; } @@ -707,16 +707,16 @@ nl80211_wiphy_info_handler(struct nl_msg *msg, void *arg) for (i = 0; i < num; i++) { switch (ciphers[i]) { case WLAN_CIPHER_SUITE_WEP40: - info->caps |= NM_WIFI_DEVICE_CAP_CIPHER_WEP40; + info->caps |= _NM_WIFI_DEVICE_CAP_CIPHER_WEP40; break; case WLAN_CIPHER_SUITE_WEP104: - info->caps |= NM_WIFI_DEVICE_CAP_CIPHER_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); + 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); + 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: @@ -736,13 +736,13 @@ nl80211_wiphy_info_handler(struct nl_msg *msg, void *arg) 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; + info->caps |= _NM_WIFI_DEVICE_CAP_AP; break; case NL80211_IFTYPE_ADHOC: - info->caps |= NM_WIFI_DEVICE_CAP_ADHOC; + info->caps |= _NM_WIFI_DEVICE_CAP_ADHOC; break; case NL80211_IFTYPE_MESH_POINT: - info->caps |= NM_WIFI_DEVICE_CAP_MESH; + info->caps |= _NM_WIFI_DEVICE_CAP_MESH; break; } } @@ -752,7 +752,7 @@ nl80211_wiphy_info_handler(struct nl_msg *msg, void *arg) info->can_wowlan = TRUE; if (tb[NL80211_ATTR_SUPPORT_IBSS_RSN]) - info->caps |= NM_WIFI_DEVICE_CAP_IBSS_RSN; + info->caps |= _NM_WIFI_DEVICE_CAP_IBSS_RSN; info->success = TRUE; diff --git a/src/core/platform/wifi/nm-wifi-utils-private.h b/src/core/platform/wifi/nm-wifi-utils-private.h index fd112033b5..80e1018f6d 100644 --- a/src/core/platform/wifi/nm-wifi-utils-private.h +++ b/src/core/platform/wifi/nm-wifi-utils-private.h @@ -59,8 +59,8 @@ typedef struct { struct NMWifiUtils { GObject parent; - int ifindex; - NMDeviceWifiCapabilities caps; + int ifindex; + _NMDeviceWifiCapabilities caps; }; #endif /* __WIFI_UTILS_PRIVATE_H__ */ diff --git a/src/core/platform/wifi/nm-wifi-utils-wext.c b/src/core/platform/wifi/nm-wifi-utils-wext.c index 1e1652fe61..fca95cfe52 100644 --- a/src/core/platform/wifi/nm-wifi-utils-wext.c +++ b/src/core/platform/wifi/nm-wifi-utils-wext.c @@ -637,36 +637,36 @@ wext_get_range_ifname(NMWifiUtilsWext *wext, 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) +#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; + 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); + 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; + 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; + caps |= _NM_WIFI_DEVICE_CAP_CIPHER_TKIP; if (range->enc_capa & IW_ENC_CAPA_CIPHER_CCMP) - caps |= NM_WIFI_DEVICE_CAP_CIPHER_CCMP; + caps |= _NM_WIFI_DEVICE_CAP_CIPHER_CCMP; if (range->enc_capa & IW_ENC_CAPA_WPA) - caps |= NM_WIFI_DEVICE_CAP_WPA; + caps |= _NM_WIFI_DEVICE_CAP_WPA; if (range->enc_capa & IW_ENC_CAPA_WPA2) - caps |= NM_WIFI_DEVICE_CAP_RSN; + 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))) { + 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); @@ -674,8 +674,8 @@ wext_get_caps(NMWifiUtilsWext *wext, const char *ifname, struct iw_range *range) } /* 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))) { + 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); @@ -686,7 +686,7 @@ wext_get_caps(NMWifiUtilsWext *wext, const char *ifname, struct iw_range *range) * (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; + caps |= _NM_WIFI_DEVICE_CAP_ADHOC; return caps; } @@ -793,11 +793,11 @@ nm_wifi_utils_wext_new(int ifindex, gboolean check_scan) wext->parent.caps = wext_get_caps(wext, ifname, &range); if (freq_valid) - wext->parent.caps |= NM_WIFI_DEVICE_CAP_FREQ_VALID; + wext->parent.caps |= _NM_WIFI_DEVICE_CAP_FREQ_VALID; if (has_2ghz) - wext->parent.caps |= NM_WIFI_DEVICE_CAP_FREQ_2GHZ; + wext->parent.caps |= _NM_WIFI_DEVICE_CAP_FREQ_2GHZ; if (has_5ghz) - wext->parent.caps |= NM_WIFI_DEVICE_CAP_FREQ_5GHZ; + wext->parent.caps |= _NM_WIFI_DEVICE_CAP_FREQ_5GHZ; _LOGI(LOGD_PLATFORM | LOGD_WIFI, "(%s): using WEXT for Wi-Fi device control", ifname); diff --git a/src/core/platform/wifi/nm-wifi-utils.c b/src/core/platform/wifi/nm-wifi-utils.c index 7b42faced5..0f2f50384b 100644 --- a/src/core/platform/wifi/nm-wifi-utils.c +++ b/src/core/platform/wifi/nm-wifi-utils.c @@ -50,10 +50,10 @@ nm_wifi_utils_new(int ifindex, struct nl_sock *genl, gboolean check_scan) return ret; } -NMDeviceWifiCapabilities +_NMDeviceWifiCapabilities nm_wifi_utils_get_caps(NMWifiUtils *data) { - g_return_val_if_fail(data != NULL, NM_WIFI_DEVICE_CAP_NONE); + g_return_val_if_fail(data != NULL, _NM_WIFI_DEVICE_CAP_NONE); return data->caps; } diff --git a/src/core/platform/wifi/nm-wifi-utils.h b/src/core/platform/wifi/nm-wifi-utils.h index c8e57d177a..d07f3c5c08 100644 --- a/src/core/platform/wifi/nm-wifi-utils.h +++ b/src/core/platform/wifi/nm-wifi-utils.h @@ -31,7 +31,7 @@ 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); +_NMDeviceWifiCapabilities nm_wifi_utils_get_caps(NMWifiUtils *data); NM80211Mode nm_wifi_utils_get_mode(NMWifiUtils *data);