aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-12-10 13:44:19 +0100
committerJohannes Berg <johannes.berg@intel.com>2012-12-10 21:24:02 +0100
commit8e3c1b77435d93c0207d4701ca5b3e84d40c983d (patch)
treee5c81f9d95f1af3dcf9072b605d061ae51a29733 /net
parentwext: explicitly cast -110 to u8 (diff)
downloadlinux-dev-8e3c1b77435d93c0207d4701ca5b3e84d40c983d.tar.xz
linux-dev-8e3c1b77435d93c0207d4701ca5b3e84d40c983d.zip
mac80211: a few whitespace fixes
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mlme.c4
-rw-r--r--net/mac80211/scan.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 09556303c7e1..7753a9ca98a6 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2360,9 +2360,9 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
return RX_MGMT_CFG80211_RX_ASSOC;
}
+
static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
- struct ieee80211_mgmt *mgmt,
- size_t len,
+ struct ieee80211_mgmt *mgmt, size_t len,
struct ieee80211_rx_status *rx_status,
struct ieee802_11_elems *elems,
bool beacon)
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index d7c190b80670..cb3df39d5fa6 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -118,7 +118,7 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
struct ieee80211_tim_ie *tim_ie = elems->tim;
bss->dtim_period = tim_ie->dtim_period;
if (!elems->parse_error)
- bss->valid_data |= IEEE80211_BSS_VALID_DTIM;
+ bss->valid_data |= IEEE80211_BSS_VALID_DTIM;
}
/* If the beacon had no TIM IE, or it was invalid, use 1 */