From f27a0711e622a2a540f30dca288864fcd435a4a9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 9 Mar 2017 11:08:30 +0100 Subject: [PATCH] wifi/trivial: fix whitespace and style --- src/devices/wifi/nm-wifi-ap.c | 277 +++++++++++++++++----------------- 1 file changed, 136 insertions(+), 141 deletions(-) diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c index 37f82365fd..5f774e4eaa 100644 --- a/src/devices/wifi/nm-wifi-ap.c +++ b/src/devices/wifi/nm-wifi-ap.c @@ -71,7 +71,7 @@ typedef struct { /* Non-scanned attributes */ bool fake:1; /* Whether or not the AP is from a scan */ bool hotspot:1; /* Whether the AP is a local device's hotspot network */ - gint32 last_seen; /* Timestamp when the AP was seen lastly (obtained via nm_utils_get_monotonic_timestamp_s()) */ + gint32 last_seen; /* Timestamp when the AP was seen lastly (obtained via nm_utils_get_monotonic_timestamp_s()) */ } NMWifiAPPrivate; struct _NMWifiAP { @@ -79,7 +79,7 @@ struct _NMWifiAP { NMWifiAPPrivate _priv; }; -struct _NMWifiAPClass{ +struct _NMWifiAPClass { NMExportedObjectClass parent; }; @@ -436,123 +436,120 @@ security_from_vardict (GVariant *security) } static guint32 -get_max_ht20_rate(int mcs) +get_max_ht20_rate (int mcs) { - if (mcs == 0) - return 6500000; - if (mcs == (1 || 8)) - return 13000000; - if (mcs == (2 || 16)) - return 19500000; - if (mcs == (3 || 9 || 24)) - return 26000000; - if (mcs == (4 || 10 || 17)) - return 39000000; - if (mcs == (5 || 11 || 25)) - return 52000000; - if (mcs == (6 || 18)) - return 58500000; - if (mcs == 7) - return 65000000; - if (mcs == (12 || 19 || 26)) - return 78000000; - if (mcs == (13 || 27)) - return 104000000; - if (mcs == (14 || 20)) - return 117000000; - if (mcs == 15) - return 130000000; - if (mcs == (21 || 28)) - return 156000000; - if (mcs == 22) - return 175500000; - if (mcs == 23) - return 195000000; - if (mcs == 29) - return 208000000; - if (mcs == 30) - return 234000000; + if (mcs == 0) + return 6500000; + if (mcs == (1 || 8)) + return 13000000; + if (mcs == (2 || 16)) + return 19500000; + if (mcs == (3 || 9 || 24)) + return 26000000; + if (mcs == (4 || 10 || 17)) + return 39000000; + if (mcs == (5 || 11 || 25)) + return 52000000; + if (mcs == (6 || 18)) + return 58500000; + if (mcs == 7) + return 65000000; + if (mcs == (12 || 19 || 26)) + return 78000000; + if (mcs == (13 || 27)) + return 104000000; + if (mcs == (14 || 20)) + return 117000000; + if (mcs == 15) + return 130000000; + if (mcs == (21 || 28)) + return 156000000; + if (mcs == 22) + return 175500000; + if (mcs == 23) + return 195000000; + if (mcs == 29) + return 208000000; + if (mcs == 30) + return 234000000; if (mcs == 31) return 260000000; - return 0; } static guint32 -get_max_ht40_rate(int mcs) +get_max_ht40_rate (int mcs) { - if (mcs == 0) - return 13500000; - if (mcs == (1 || 8)) - return 27000000; - if (mcs == 2) - return 40500000; - if (mcs == (3 || 9 || 24)) - return 54000000; - if (mcs == (4 || 10 || 17)) - return 81000000; - if (mcs == (5 || 11 || 25)) - return 108000000; - if (mcs == (6 || 18)) - return 121500000; - if (mcs == 7) - return 135000000; - if (mcs == (12 || 19 || 26)) - return 162000000; - if (mcs == (13 || 27)) - return 216000000; - if (mcs == (14 || 20)) - return 243000000; - if (mcs == 15) - return 270000000; - if (mcs == 16) - return 40500000; - if (mcs == (21 || 28)) - return 324000000; - if (mcs == 22) - return 364500000; - if (mcs == 23) - return 405000000; - if (mcs == 29) - return 432000000; - if (mcs == 30) - return 486000000; - if (mcs == 31) - return 540000000; - + if (mcs == 0) + return 13500000; + if (mcs == (1 || 8)) + return 27000000; + if (mcs == 2) + return 40500000; + if (mcs == (3 || 9 || 24)) + return 54000000; + if (mcs == (4 || 10 || 17)) + return 81000000; + if (mcs == (5 || 11 || 25)) + return 108000000; + if (mcs == (6 || 18)) + return 121500000; + if (mcs == 7) + return 135000000; + if (mcs == (12 || 19 || 26)) + return 162000000; + if (mcs == (13 || 27)) + return 216000000; + if (mcs == (14 || 20)) + return 243000000; + if (mcs == 15) + return 270000000; + if (mcs == 16) + return 40500000; + if (mcs == (21 || 28)) + return 324000000; + if (mcs == 22) + return 364500000; + if (mcs == 23) + return 405000000; + if (mcs == 29) + return 432000000; + if (mcs == 30) + return 486000000; + if (mcs == 31) + return 540000000; return 0; } static guint32 -get_max_vht80_rate_ss1(int mcs) +get_max_vht80_rate_ss1 (int mcs) { - if (mcs == 0) - return 29300000; - if (mcs == 1) - return 58500000; - if (mcs == 2) - return 87800000; - if (mcs == 3) - return 117000000; - if (mcs == 4) - return 175500000; - if (mcs == 5) - return 234000000; - if (mcs == 6) - return 263300000; - if (mcs == 7) - return 292500000; - if (mcs == 8) - return 351000000; + if (mcs == 0) + return 29300000; + if (mcs == 1) + return 58500000; + if (mcs == 2) + return 87800000; + if (mcs == 3) + return 117000000; + if (mcs == 4) + return 175500000; + if (mcs == 5) + return 234000000; + if (mcs == 6) + return 263300000; + if (mcs == 7) + return 292500000; + if (mcs == 8) + return 351000000; if (mcs == 9) return 390000000; - return 0; + return 0; } static guint32 -get_max_vht80_rate_ss2(int mcs) +get_max_vht80_rate_ss2 (int mcs) { - if (mcs == 0) return 58500000; if (mcs == 1) @@ -577,9 +574,8 @@ get_max_vht80_rate_ss2(int mcs) } static guint32 -get_max_vht80_rate_ss3(int mcs) +get_max_vht80_rate_ss3 (int mcs) { - if (mcs == 0) return 87800000; if (mcs == 1) @@ -604,35 +600,34 @@ get_max_vht80_rate_ss3(int mcs) } static guint32 -get_max_vht160_rate_ss1(int mcs) +get_max_vht160_rate_ss1 (int mcs) { if (mcs == 0) - return 58500000; + return 58500000; if (mcs == 1) - return 117000000; + return 117000000; if (mcs == 2) - return 175500000; + return 175500000; if (mcs == 3) - return 234000000; + return 234000000; if (mcs == 4) - return 351000000; + return 351000000; if (mcs == 5) - return 468000000; + return 468000000; if (mcs == 6) - return 526500000; + return 526500000; if (mcs == 7) - return 585000000; + return 585000000; if (mcs == 8) - return 702000000; + return 702000000; if (mcs == 9) return 780000000; return 0; } static guint32 -get_max_vht160_rate_ss2(int mcs) +get_max_vht160_rate_ss2 (int mcs) { - if (mcs == 0) return 117000000; if (mcs == 1) @@ -657,9 +652,8 @@ get_max_vht160_rate_ss2(int mcs) } static guint32 -get_max_vht160_rate_ss3(int mcs) +get_max_vht160_rate_ss3 (int mcs) { - if (mcs == 0) return 175500000; if (mcs == 1) @@ -684,13 +678,14 @@ get_max_vht160_rate_ss3(int mcs) } static guint32 -get_max_ht_rate(guint16 ht_cap_info, const guint8 * supported_mcs_set){ - guint32 mcs,i,j; +get_max_ht_rate (guint16 ht_cap_info, const guint8 *supported_mcs_set) +{ + guint32 mcs, i, j; /* Find the maximum supported mcs rate */ mcs = -1; - for (i = 0; i <= 15; i++){ - for (j = 0; j <= 7; j++){ + for (i = 0; i <= 15; i++) { + for (j = 0; j <= 7; j++) { if (*supported_mcs_set & (1 << j)) mcs++; } @@ -699,14 +694,15 @@ get_max_ht_rate(guint16 ht_cap_info, const guint8 * supported_mcs_set){ /* Check for 40Mhz wide channel support */ if (ht_cap_info & (1 << 1)) - return get_max_ht40_rate(mcs); + return get_max_ht40_rate (mcs); else - return get_max_ht20_rate(mcs); + return get_max_ht20_rate (mcs); } static guint32 -get_max_vht_rate(guint32 vht_cap,guint16 tx_map){ +get_max_vht_rate (guint32 vht_cap, guint16 tx_map) +{ guint32 mcs = 7, ss = 1; /* Check for mcs rates 8 and 9 support */ @@ -717,30 +713,31 @@ get_max_vht_rate(guint32 vht_cap,guint16 tx_map){ /* Check for 160Mhz wide channel support and * spatial stream support */ - if ( vht_cap & (1 << 2)){ + if (vht_cap & (1 << 2)) { if (tx_map & 0x30) - return get_max_vht160_rate_ss3(mcs); + return get_max_vht160_rate_ss3 (mcs); else if (tx_map & 0x0C) - return get_max_vht160_rate_ss2(mcs); + return get_max_vht160_rate_ss2 (mcs); else - return get_max_vht160_rate_ss1(mcs); + return get_max_vht160_rate_ss1 (mcs); } else { if (tx_map & 0x30) - return get_max_vht80_rate_ss3(mcs); + return get_max_vht80_rate_ss3 (mcs); else if (tx_map & 0x0C) - return get_max_vht80_rate_ss2(mcs); + return get_max_vht80_rate_ss2 (mcs); else - return get_max_vht80_rate_ss1(mcs); + return get_max_vht80_rate_ss1 (mcs); } return 0; } -#define IEEE_80211_IE_HT_CAP 45 +#define IEEE_80211_IE_HT_CAP 45 #define IEEE_80211_IE_VHT_CAP 191 static guint32 -get_max_rate(const guint8 *bytes, gsize len){ +get_max_rate (const guint8 *bytes, gsize len) +{ guint8 id, elem_len; guint32 max_rate = 0; @@ -753,13 +750,11 @@ get_max_rate(const guint8 *bytes, gsize len){ return -1; } - if (id == IEEE_80211_IE_HT_CAP){ - max_rate = get_max_ht_rate(*bytes,bytes+3); - } + if (id == IEEE_80211_IE_HT_CAP) + max_rate = get_max_ht_rate (*bytes, bytes+3); - if (id == IEEE_80211_IE_VHT_CAP) { - max_rate = get_max_vht_rate(*bytes,*(bytes+8)); - } + if (id == IEEE_80211_IE_VHT_CAP) + max_rate = get_max_vht_rate (*bytes, *(bytes+8)); len -= elem_len; bytes += elem_len; @@ -847,12 +842,12 @@ nm_wifi_ap_update_from_properties (NMWifiAP *ap, } v = g_variant_lookup_value (properties, "IEs", G_VARIANT_TYPE_BYTESTRING); - if (v){ + if (v) { bytes = g_variant_get_fixed_array (v, &len, 1); - guint32 max_rate = get_max_rate(bytes,len); + guint32 max_rate = get_max_rate (bytes, len); if (max_rate > 0) nm_wifi_ap_set_max_bitrate (ap, max_rate / 1000); - g_variant_unref(v); + g_variant_unref (v); } v = g_variant_lookup_value (properties, "WPA", G_VARIANT_TYPE_VARDICT);