New upstream version 1.27.90 upstream/1.27.90

1 files changed, 95 insertions, 96 deletions

diff --git a/src/platform/wifi/nm-wifi-utils.c b/src/platform/wifi/nm-wifi-utils.c
index 39ce9b09..3f9d3a48 100644
--- a/src/platform/wifi/nm-wifi-utils.c
+++ b/src/platform/wifi/nm-wifi-utils.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2005 - 2018 Red Hat, Inc.
  * Copyright (C) 2006 - 2008 Novell, Inc.
@@ -15,211 +15,210 @@
 #include "nm-wifi-utils-private.h"
 #include "nm-wifi-utils-nl80211.h"
 #if HAVE_WEXT
-#include "nm-wifi-utils-wext.h"
+    #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)
+G_DEFINE_ABSTRACT_TYPE(NMWifiUtils, nm_wifi_utils, G_TYPE_OBJECT)
 
 /*****************************************************************************/
 
 static void
-nm_wifi_utils_init (NMWifiUtils *self)
-{
-}
+nm_wifi_utils_init(NMWifiUtils *self)
+{}
 
 static void
-nm_wifi_utils_class_init (NMWifiUtilsClass *klass)
-{
-}
+nm_wifi_utils_class_init(NMWifiUtilsClass *klass)
+{}
 
 NMWifiUtils *
-nm_wifi_utils_new (int ifindex, struct nl_sock *genl, gboolean check_scan)
+nm_wifi_utils_new(int ifindex, struct nl_sock *genl, gboolean check_scan)
 {
-	NMWifiUtils *ret;
+    NMWifiUtils *ret;
 
-	g_return_val_if_fail (ifindex > 0, NULL);
+    g_return_val_if_fail(ifindex > 0, NULL);
 
-	ret = nm_wifi_utils_nl80211_new (ifindex, genl);
+    ret = nm_wifi_utils_nl80211_new(ifindex, genl);
 
 #if HAVE_WEXT
-	if (ret == NULL)
-		ret = nm_wifi_utils_wext_new (ifindex, check_scan);
+    if (ret == NULL)
+        ret = nm_wifi_utils_wext_new(ifindex, check_scan);
 #endif
 
-	return ret;
+    return ret;
 }
 
 NMDeviceWifiCapabilities
-nm_wifi_utils_get_caps (NMWifiUtils *data)
+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;
+    return data->caps;
 }
 
 NM80211Mode
-nm_wifi_utils_get_mode (NMWifiUtils *data)
+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);
+    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)
+nm_wifi_utils_set_mode(NMWifiUtils *data, const NM80211Mode mode)
 {
-	NMWifiUtilsClass *klass;
+    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);
+    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);
+    klass = NM_WIFI_UTILS_GET_CLASS(data);
 
-	/* nl80211 probably doesn't need this */
-	return klass->set_mode ? klass->set_mode (data, mode) : TRUE;
+    /* 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)
+nm_wifi_utils_set_powersave(NMWifiUtils *data, guint32 powersave)
 {
-	NMWifiUtilsClass *klass;
+    NMWifiUtilsClass *klass;
 
-	g_return_val_if_fail (data != NULL, FALSE);
+    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;
+    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)
+nm_wifi_utils_get_wake_on_wlan(NMWifiUtils *data)
 {
-	NMWifiUtilsClass *klass;
+    NMWifiUtilsClass *klass;
 
-	g_return_val_if_fail (data != NULL, NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE);
+    g_return_val_if_fail(data != NULL, NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE);
 
-	klass = NM_WIFI_UTILS_GET_CLASS (data);
+    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;
+    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)
+nm_wifi_utils_set_wake_on_wlan(NMWifiUtils *data, NMSettingWirelessWakeOnWLan wowl)
 {
-	NMWifiUtilsClass *klass;
+    NMWifiUtilsClass *klass;
 
-	g_return_val_if_fail (data != NULL, FALSE);
+    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;
+    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)
+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);
+    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)
+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);
+    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)
+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);
+    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);
+    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)
+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);
+    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)
+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);
+    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)
+nm_wifi_utils_is_wifi(int dirfd, const char *ifname)
 {
-	g_return_val_if_fail (dirfd >= 0, FALSE);
+    g_return_val_if_fail(dirfd >= 0, FALSE);
 
-	if (faccessat (dirfd, "phy80211", F_OK, 0) == 0)
-		return TRUE;
+    if (faccessat(dirfd, "phy80211", F_OK, 0) == 0)
+        return TRUE;
 #if HAVE_WEXT
-	if (nm_wifi_utils_wext_is_wifi (ifname))
-		return TRUE;
+    if (nm_wifi_utils_wext_is_wifi(ifname))
+        return TRUE;
 #endif
-	return FALSE;
+    return FALSE;
 }
 
 /* OLPC Mesh-only functions */
 
 guint32
-nm_wifi_utils_get_mesh_channel (NMWifiUtils *data)
+nm_wifi_utils_get_mesh_channel(NMWifiUtils *data)
 {
-	NMWifiUtilsClass *klass;
+    NMWifiUtilsClass *klass;
 
-	g_return_val_if_fail (data != NULL, FALSE);
+    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);
+    klass = NM_WIFI_UTILS_GET_CLASS(data);
+    g_return_val_if_fail(klass->get_mesh_channel != NULL, FALSE);
 
-	return klass->get_mesh_channel (data);
+    return klass->get_mesh_channel(data);
 }
 
 gboolean
-nm_wifi_utils_set_mesh_channel (NMWifiUtils *data, guint32 channel)
+nm_wifi_utils_set_mesh_channel(NMWifiUtils *data, guint32 channel)
 {
-	NMWifiUtilsClass *klass;
+    NMWifiUtilsClass *klass;
 
-	g_return_val_if_fail (data != NULL, FALSE);
-	g_return_val_if_fail (channel <= 13, FALSE);
+    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);
+    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);
+    return klass->set_mesh_channel(data, channel);
 }
 
 gboolean
-nm_wifi_utils_set_mesh_ssid (NMWifiUtils *data, const guint8 *ssid, gsize len)
+nm_wifi_utils_set_mesh_ssid(NMWifiUtils *data, const guint8 *ssid, gsize len)
 {
-	NMWifiUtilsClass *klass;
+    NMWifiUtilsClass *klass;
 
-	g_return_val_if_fail (data != NULL, FALSE);
+    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);
+    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);
+    return klass->set_mesh_ssid(data, ssid, len);
 }
 
 gboolean
-nm_wifi_utils_indicate_addressing_running (NMWifiUtils *data, gboolean running)
+nm_wifi_utils_indicate_addressing_running(NMWifiUtils *data, gboolean running)
 {
-	NMWifiUtilsClass *klass;
+    NMWifiUtilsClass *klass;
 
-	g_return_val_if_fail (data != NULL, FALSE);
+    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;
+    klass = NM_WIFI_UTILS_GET_CLASS(data);
+    return klass->indicate_addressing_running ? klass->indicate_addressing_running(data, running)
+                                              : FALSE;
 }