Staging: Merge staging-next into Linus's tree

[sfrench/cifs-2.6.git] / net / mac80211 / scan.c

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index e1b0be7a57b9772ddb1c006793ca6a5929580aba..41f20fb7e67083fa8635ba50de021babe7778e8c 100644 (file)
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -114,6 +114,10 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
                bss->dtim_period = tim_ie->dtim_period;
        }
 
+       /* If the beacon had no TIM IE, or it was invalid, use 1 */
+       if (beacon && !bss->dtim_period)
+               bss->dtim_period = 1;
+
        /* replace old supported rates if we get new values */
        srlen = 0;
        if (elems->supp_rates) {
@@ -734,7 +738,7 @@ int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
 {
        struct ieee80211_local *local = sdata->local;
        int ret = -EBUSY;
-       enum nl80211_band band;
+       enum ieee80211_band band;
 
        mutex_lock(&local->scan_mtx);