Hello John, On Mon, Apr 30, 2012 at 12:09 PM, John W. Linville <linville@xxxxxxxxxxxxx> wrote: > On Thu, Apr 26, 2012 at 08:48:25PM -0700, Ashok Nagarajan wrote: >> Now that we have protection enabled, allow non-HT and HT20 stations to peer >> with HT40+/- stations. Peering is still disallowed for HT40+/- mismatch. >> >> Signed-off-by: Ashok Nagarajan <ashok@xxxxxxxxxxx> >> Reviewed-by: Thomas Pedersen <thomas@xxxxxxxxxxx> > > CC net/mac80211/mesh.o > net/mac80211/mesh.c: In function ‘mesh_matches_local’: > net/mac80211/mesh.c:79:28: warning: ‘sta_channel_type’ may be used uninitialized in this function > > Please don't add warnings! > Sorry for the warning. Version 2 is coming. Thanks, Ashok >> --- >> net/mac80211/mesh.c | 12 +++++++++--- >> 1 files changed, 9 insertions(+), 3 deletions(-) >> >> diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c >> index 8a952e0..d25cb78 100644 >> --- a/net/mac80211/mesh.c >> +++ b/net/mac80211/mesh.c >> @@ -76,6 +76,7 @@ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata, >> struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; >> struct ieee80211_local *local = sdata->local; >> u32 basic_rates = 0; >> + enum nl80211_channel_type sta_channel_type; >> >> /* >> * As support for each feature is added, check for matching >> @@ -102,10 +103,15 @@ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata, >> if (sdata->vif.bss_conf.basic_rates != basic_rates) >> goto mismatch; >> >> - /* disallow peering with mismatched channel types for now */ >> + if (ie->ht_operation) >> + sta_channel_type = >> + ieee80211_ht_oper_to_channel_type(ie->ht_operation); >> + >> + /* Disallow HT40+/- mismatch */ >> if (ie->ht_operation && >> - (local->_oper_channel_type != >> - ieee80211_ht_oper_to_channel_type(ie->ht_operation))) >> + local->_oper_channel_type > NL80211_CHAN_HT20 && >> + sta_channel_type > NL80211_CHAN_HT20 && >> + local->_oper_channel_type != sta_channel_type) >> goto mismatch; >> >> return true; >> -- >> 1.7.5.4 >> >> > > -- > John W. Linville Someday the world will need a hero, and you > linville@xxxxxxxxxxxxx might be all we have. Be ready. -- 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
