a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac80211: Allow nonHT/HT peering in mesh

Browse Source 
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@cozybit.com>
Reviewed-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Ashok Nagarajan 2012-04-30 14:20:31 -07:00 committed by John W. Linville
parent 57aac7c51c
commit b91e64aad2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/mac80211/mesh.c
View File

@ -76,6 +76,7 @@ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata,
struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
u32 basic_rates = 0; u32 basic_rates = 0;
enum nl80211_channel_type sta_channel_type = NL80211_CHAN_NO_HT;
/* /*
* As support for each feature is added, check for matching * 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) if (sdata->vif.bss_conf.basic_rates != basic_rates)
goto mismatch; 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 && if (ie->ht_operation &&
(local->_oper_channel_type != local->_oper_channel_type > NL80211_CHAN_HT20 &&
ieee80211_ht_oper_to_channel_type(ie->ht_operation))) sta_channel_type > NL80211_CHAN_HT20 &&
local->_oper_channel_type != sta_channel_type)
goto mismatch; goto mismatch;
return true; return true;