From 804ba07ffc75645c437c7e157a8ba132f2e8ed9c Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 10 Dec 2012 13:44:19 +0100 Subject: [PATCH] --- yaml --- r: 342142 b: refs/heads/master c: 8e3c1b77435d93c0207d4701ca5b3e84d40c983d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 4 ++-- trunk/net/mac80211/scan.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c0977e51f6d3..1ef167e9b5b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7d83ed8d0c486fc342e93291e31b3283e3721e7 +refs/heads/master: 8e3c1b77435d93c0207d4701ca5b3e84d40c983d diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 09556303c7e1..7753a9ca98a6 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/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/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c index d7c190b80670..cb3df39d5fa6 100644 --- a/trunk/net/mac80211/scan.c +++ b/trunk/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 */