diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-12-11 16:04:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-12-11 16:04:03 -0500 |
| commit | c66cfd5325bb215a251f4685fac8718b1da33197 (patch) | |
| tree | 7c8ed5289c4a99ffcd2588ac48b5a512312a375b /net/mac80211/scan.c | |
| parent | ecbbec2eb093d2ef205de371af986f0360fca539 (diff) | |
| parent | 8acbcddb5fb3a1dc081defe51b6ac42a7ab0b398 (diff) | |
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 f7176ac5a535..8ed83dcc149f 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c | |||
| @@ -118,7 +118,7 @@ ieee80211_bss_info_update(struct ieee80211_local *local, | |||
| 118 | struct ieee80211_tim_ie *tim_ie = elems->tim; | 118 | struct ieee80211_tim_ie *tim_ie = elems->tim; |
| 119 | bss->dtim_period = tim_ie->dtim_period; | 119 | bss->dtim_period = tim_ie->dtim_period; |
| 120 | if (!elems->parse_error) | 120 | if (!elems->parse_error) |
| 121 | bss->valid_data |= IEEE80211_BSS_VALID_DTIM; | 121 | bss->valid_data |= IEEE80211_BSS_VALID_DTIM; |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | /* If the beacon had no TIM IE, or it was invalid, use 1 */ | 124 | /* If the beacon had no TIM IE, or it was invalid, use 1 */ |