lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cfg80211: fix whitespace in scan handling

Browse Source 
Fix a number of indentation and similar issues.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg
2012-11-28 22:39:37 +01:00
parent b629ea3db4
commit 915de2ff4a
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
net/wireless/scan.c
View File

@@ -238,9 +238,8 @@ void cfg80211_bss_age(struct cfg80211_registered_device *dev,
struct cfg80211_internal_bss *bss; struct cfg80211_internal_bss *bss;
unsigned long age_jiffies = msecs_to_jiffies(age_secs * MSEC_PER_SEC); 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; bss->ts -= age_jiffies;
}
} }
void cfg80211_bss_expire(struct cfg80211_registered_device *dev) 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]); return memcmp(ie1 + 2, ie2 + 2, ie1[1]);
} }
static bool is_bss(struct cfg80211_bss *a, static bool is_bss(struct cfg80211_bss *a, const u8 *bssid,
const u8 *bssid,
const u8 *ssid, size_t ssid_len) const u8 *ssid, size_t ssid_len)
{ {
const u8 *ssidie; const u8 *ssidie;
@@ -386,11 +384,10 @@ static bool is_mesh(struct cfg80211_bss *a,
* part in the same mesh. * part in the same mesh.
*/ */
return memcmp(ie + 2, meshcfg, 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, static int cmp_bss_core(struct cfg80211_bss *a, struct cfg80211_bss *b)
struct cfg80211_bss *b)
{ {
int r; int r;
@@ -435,8 +432,7 @@ static int cmp_bss(struct cfg80211_bss *a,
b->len_information_elements); b->len_information_elements);
} }
static int cmp_hidden_bss(struct cfg80211_bss *a, static int cmp_hidden_bss(struct cfg80211_bss *a, struct cfg80211_bss *b)
struct cfg80211_bss *b)
{ {
const u8 *ie1; const u8 *ie1;
const u8 *ie2; const u8 *ie2;
@@ -448,11 +444,11 @@ static int cmp_hidden_bss(struct cfg80211_bss *a,
return r; return r;
ie1 = cfg80211_find_ie(WLAN_EID_SSID, ie1 = cfg80211_find_ie(WLAN_EID_SSID,
a->information_elements, a->information_elements,
a->len_information_elements); a->len_information_elements);
ie2 = cfg80211_find_ie(WLAN_EID_SSID, ie2 = cfg80211_find_ie(WLAN_EID_SSID,
b->information_elements, b->information_elements,
b->len_information_elements); b->len_information_elements);
/* Key comparator must use same algorithm in any rb-tree /* Key comparator must use same algorithm in any rb-tree
* search function (order is important), otherwise ordering * search function (order is important), otherwise ordering
@@ -602,7 +598,7 @@ rb_find_bss(struct cfg80211_registered_device *dev,
static struct cfg80211_internal_bss * static struct cfg80211_internal_bss *
rb_find_hidden_bss(struct cfg80211_registered_device *dev, 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 rb_node *n = dev->bss_tree.rb_node;
struct cfg80211_internal_bss *bss; struct cfg80211_internal_bss *bss;
@@ -625,7 +621,7 @@ rb_find_hidden_bss(struct cfg80211_registered_device *dev,
static void static void
copy_hidden_ies(struct cfg80211_internal_bss *res, copy_hidden_ies(struct cfg80211_internal_bss *res,
struct cfg80211_internal_bss *hidden) struct cfg80211_internal_bss *hidden)
{ {
if (unlikely(res->pub.beacon_ies)) if (unlikely(res->pub.beacon_ies))
return; return;
@@ -639,7 +635,7 @@ copy_hidden_ies(struct cfg80211_internal_bss *res,
res->beacon_ies_allocated = true; res->beacon_ies_allocated = true;
res->pub.len_beacon_ies = hidden->pub.len_beacon_ies; res->pub.len_beacon_ies = hidden->pub.len_beacon_ies;
memcpy(res->pub.beacon_ies, hidden->pub.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 * 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_information_elements =
found->pub.len_proberesp_ies; found->pub.len_proberesp_ies;
} }
if (res->pub.beacon_ies) { if (res->pub.beacon_ies) {
size_t used = dev->wiphy.bss_priv_size + sizeof(*res); size_t used = dev->wiphy.bss_priv_size + sizeof(*res);
size_t ielen = res->pub.len_beacon_ies; size_t ielen = res->pub.len_beacon_ies;