mac80211: don't set mesh peer ht caps if ht disabled
Blindly setting ht caps on a mesh peer's station entry would result in MCS rates being used by the rate control algorithm even if no ht had been configured. Fix this by checking the channel type before assigning ht capabilites. Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Родитель
f743ff4907
Коммит
e76781e48f
|
@ -295,7 +295,8 @@ static struct sta_info *mesh_peer_init(struct ieee80211_sub_if_data *sdata,
|
||||||
spin_lock_bh(&sta->lock);
|
spin_lock_bh(&sta->lock);
|
||||||
sta->last_rx = jiffies;
|
sta->last_rx = jiffies;
|
||||||
sta->sta.supp_rates[band] = rates;
|
sta->sta.supp_rates[band] = rates;
|
||||||
if (elems->ht_cap_elem)
|
if (elems->ht_cap_elem &&
|
||||||
|
sdata->local->_oper_channel_type != NL80211_CHAN_NO_HT)
|
||||||
ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
|
ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
|
||||||
elems->ht_cap_elem,
|
elems->ht_cap_elem,
|
||||||
&sta->sta.ht_cap);
|
&sta->sta.ht_cap);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче