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/ibss.c | |
| parent | ecbbec2eb093d2ef205de371af986f0360fca539 (diff) | |
| parent | 8acbcddb5fb3a1dc081defe51b6ac42a7ab0b398 (diff) | |
| download | blackbird-obmc-linux-c66cfd5325bb215a251f4685fac8718b1da33197.tar.gz blackbird-obmc-linux-c66cfd5325bb215a251f4685fac8718b1da33197.zip | |
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index fa862b24a7e0..8881fc77fb13 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -201,6 +201,20 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, bss_change |= BSS_CHANGED_BASIC_RATES; bss_change |= BSS_CHANGED_HT; bss_change |= BSS_CHANGED_IBSS; + + /* + * In 5 GHz/802.11a, we can always use short slot time. + * (IEEE 802.11-2012 18.3.8.7) + * + * In 2.4GHz, we must always use long slots in IBSS for compatibility + * reasons. + * (IEEE 802.11-2012 19.4.5) + * + * HT follows these specifications (IEEE 802.11-2012 20.3.18) + */ + sdata->vif.bss_conf.use_short_slot = chan->band == IEEE80211_BAND_5GHZ; + bss_change |= BSS_CHANGED_ERP_SLOT; + sdata->vif.bss_conf.ibss_joined = true; sdata->vif.bss_conf.ibss_creator = creator; ieee80211_bss_info_change_notify(sdata, bss_change); |
