]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
cfg80211: fix whitespace in scan handling
authorJohannes Berg <johannes.berg@intel.com>
Wed, 28 Nov 2012 21:39:37 +0000 (22:39 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 30 Nov 2012 12:41:25 +0000 (13:41 +0100)
Fix a number of indentation and similar issues.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/wireless/scan.c

index 5af431f2f90af122086b974a133deefbb13ba38b..92339105aa3b3b30468f5373657105d5ba202fe5 100644 (file)
@@ -238,9 +238,8 @@ void cfg80211_bss_age(struct cfg80211_registered_device *dev,
        struct cfg80211_internal_bss *bss;
        unsigned long age_jiffies = msecs_to_jiffies(age_secs * MSEC_PER_SEC);
 
-       list_for_each_entry(bss, &dev->bss_list, list) {
+       list_for_each_entry(bss, &dev->bss_list, list)
                bss->ts -= age_jiffies;
-       }
 }
 
 void cfg80211_bss_expire(struct cfg80211_registered_device *dev)
@@ -309,8 +308,7 @@ static int cmp_ies(u8 num, u8 *ies1, size_t len1, u8 *ies2, size_t len2)
        return memcmp(ie1 + 2, ie2 + 2, ie1[1]);
 }
 
-static bool is_bss(struct cfg80211_bss *a,
-                  const u8 *bssid,
+static bool is_bss(struct cfg80211_bss *a, const u8 *bssid,
                   const u8 *ssid, size_t ssid_len)
 {
        const u8 *ssidie;
@@ -386,11 +384,10 @@ static bool is_mesh(struct cfg80211_bss *a,
         * part in the same mesh.
         */
        return memcmp(ie + 2, meshcfg,
-           sizeof(struct ieee80211_meshconf_ie) - 2) == 0;
+                     sizeof(struct ieee80211_meshconf_ie) - 2) == 0;
 }
 
-static int cmp_bss_core(struct cfg80211_bss *a,
-                       struct cfg80211_bss *b)
+static int cmp_bss_core(struct cfg80211_bss *a, struct cfg80211_bss *b)
 {
        int r;
 
@@ -435,8 +432,7 @@ static int cmp_bss(struct cfg80211_bss *a,
                       b->len_information_elements);
 }
 
-static int cmp_hidden_bss(struct cfg80211_bss *a,
-                  struct cfg80211_bss *b)
+static int cmp_hidden_bss(struct cfg80211_bss *a, struct cfg80211_bss *b)
 {
        const u8 *ie1;
        const u8 *ie2;
@@ -448,11 +444,11 @@ static int cmp_hidden_bss(struct cfg80211_bss *a,
                return r;
 
        ie1 = cfg80211_find_ie(WLAN_EID_SSID,
-                       a->information_elements,
-                       a->len_information_elements);
+                              a->information_elements,
+                              a->len_information_elements);
        ie2 = cfg80211_find_ie(WLAN_EID_SSID,
-                       b->information_elements,
-                       b->len_information_elements);
+                              b->information_elements,
+                              b->len_information_elements);
 
        /* Key comparator must use same algorithm in any rb-tree
         * search function (order is important), otherwise ordering
@@ -602,7 +598,7 @@ rb_find_bss(struct cfg80211_registered_device *dev,
 
 static struct cfg80211_internal_bss *
 rb_find_hidden_bss(struct cfg80211_registered_device *dev,
-           struct cfg80211_internal_bss *res)
+                  struct cfg80211_internal_bss *res)
 {
        struct rb_node *n = dev->bss_tree.rb_node;
        struct cfg80211_internal_bss *bss;
@@ -625,7 +621,7 @@ rb_find_hidden_bss(struct cfg80211_registered_device *dev,
 
 static void
 copy_hidden_ies(struct cfg80211_internal_bss *res,
-                struct cfg80211_internal_bss *hidden)
+               struct cfg80211_internal_bss *hidden)
 {
        if (unlikely(res->pub.beacon_ies))
                return;
@@ -639,7 +635,7 @@ copy_hidden_ies(struct cfg80211_internal_bss *res,
        res->beacon_ies_allocated = true;
        res->pub.len_beacon_ies = hidden->pub.len_beacon_ies;
        memcpy(res->pub.beacon_ies, hidden->pub.beacon_ies,
-                       res->pub.len_beacon_ies);
+              res->pub.len_beacon_ies);
 }
 
 static struct cfg80211_internal_bss *
@@ -704,6 +700,7 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev,
                        found->pub.len_information_elements =
                                found->pub.len_proberesp_ies;
                }
+
                if (res->pub.beacon_ies) {
                        size_t used = dev->wiphy.bss_priv_size + sizeof(*res);
                        size_t ielen = res->pub.len_beacon_ies;