diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-28 13:18:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-28 13:18:21 -0400 |
| commit | 57ed5cd695d7373b8ae0ae9f10fe945e774d58f0 (patch) | |
| tree | 7ee6244ea7c0be81a541d4e57783f83c4dfd7d66 /net/mac80211/scan.c | |
| parent | 5e6700b3bf98fe98d630bf9c939ad4c85ce95592 (diff) | |
| parent | 0f817ed52d07873cd39c9d3f6d87fae962dc742f (diff) | |
| download | linux-57ed5cd695d7373b8ae0ae9f10fe945e774d58f0.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
net/wireless/nl80211.c
Diffstat (limited to 'net/mac80211/scan.c')
| -rw-r--r-- | net/mac80211/scan.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 99b103921a4b..1b122a79b0d8 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -140,6 +140,15 @@ ieee80211_bss_info_update(struct ieee80211_local *local, bss->valid_data |= IEEE80211_BSS_VALID_WMM; } + if (beacon) { + struct ieee80211_supported_band *sband = + local->hw.wiphy->bands[rx_status->band]; + if (!(rx_status->flag & RX_FLAG_HT) && + !(rx_status->flag & RX_FLAG_VHT)) + bss->beacon_rate = + &sband->bitrates[rx_status->rate_idx]; + } + return bss; } |