diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-12-11 21:04:03 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-12-11 21:04:03 (GMT) |
commit | c66cfd5325bb215a251f4685fac8718b1da33197 (patch) | |
tree | 7c8ed5289c4a99ffcd2588ac48b5a512312a375b /net/mac80211/scan.c | |
parent | ecbbec2eb093d2ef205de371af986f0360fca539 (diff) | |
parent | 8acbcddb5fb3a1dc081defe51b6ac42a7ab0b398 (diff) | |
download | linux-fsl-qoriq-c66cfd5325bb215a251f4685fac8718b1da33197.tar.xz |
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r-- | net/mac80211/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index f7176ac..8ed83dc 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 */ |