On Wed, Apr 18, 2012 at 7:24 PM, Thomas Pedersen <thomas@xxxxxxxxxxx> wrote: > 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@xxxxxxxxxxx> > --- > net/mac80211/mesh_plink.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c > index c2af7b3..1ff2a5c 100644 > --- a/net/mac80211/mesh_plink.c > +++ b/net/mac80211/mesh_plink.c > @@ -295,7 +295,8 @@ static struct sta_info *mesh_peer_init(struct ieee80211_sub_if_data *sdata, > spin_lock_bh(&sta->lock); > sta->last_rx = jiffies; > 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, > elems->ht_cap_elem, > &sta->sta.ht_cap); > -- > 1.7.5.4 > Yikes, this obviously needs the mesh refactor series to apply. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
