lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: set HT capabilities for mesh peer

Browse Source 
Set peer's HT capabilities, and disallow peering if we're on a different
channel type.

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Ashok Nagarajan <anagar6@uic.edu>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Thomas Pedersen
2011-10-26 14:47:28 -07:00
committed by John W. Linville
parent 176f36086e
commit 739522baa1
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
net/mac80211/mesh.c
View File

@@ -76,6 +76,7 @@ static void ieee80211_mesh_housekeeping_timer(unsigned long data)
bool mesh_matches_local(struct ieee802_11_elems *ie, struct ieee80211_sub_if_data *sdata) bool mesh_matches_local(struct ieee802_11_elems *ie, 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;
/* /*
* As support for each feature is added, check for matching * As support for each feature is added, check for matching
@@ -87,15 +88,23 @@ bool mesh_matches_local(struct ieee802_11_elems *ie, struct ieee80211_sub_if_dat
* - MDA enabled * - MDA enabled
* - Power management control on fc * - Power management control on fc
*/ */
if (ifmsh->mesh_id_len == ie->mesh_id_len && if (!(ifmsh->mesh_id_len == ie->mesh_id_len &&
memcmp(ifmsh->mesh_id, ie->mesh_id, ie->mesh_id_len) == 0 && memcmp(ifmsh->mesh_id, ie->mesh_id, ie->mesh_id_len) == 0 &&
(ifmsh->mesh_pp_id == ie->mesh_config->meshconf_psel) && (ifmsh->mesh_pp_id == ie->mesh_config->meshconf_psel) &&
(ifmsh->mesh_pm_id == ie->mesh_config->meshconf_pmetric) && (ifmsh->mesh_pm_id == ie->mesh_config->meshconf_pmetric) &&
(ifmsh->mesh_cc_id == ie->mesh_config->meshconf_congest) && (ifmsh->mesh_cc_id == ie->mesh_config->meshconf_congest) &&
(ifmsh->mesh_sp_id == ie->mesh_config->meshconf_synch) && (ifmsh->mesh_sp_id == ie->mesh_config->meshconf_synch) &&
(ifmsh->mesh_auth_id == ie->mesh_config->meshconf_auth)) (ifmsh->mesh_auth_id == ie->mesh_config->meshconf_auth)))
return true; goto mismatch;
/* disallow peering with mismatched channel types for now */
if (ie->ht_info_elem &&
(local->_oper_channel_type !=
ieee80211_ht_info_to_channel_type(ie->ht_info_elem)))
goto mismatch;
return true;
mismatch:
return false; return false;
} }

13
net/mac80211/mesh_plink.c
View File

@@ -80,11 +80,15 @@ static inline void mesh_plink_fsm_restart(struct sta_info *sta)
* on it in the lifecycle management section! * on it in the lifecycle management section!
*/ */
static struct sta_info *mesh_plink_alloc(struct ieee80211_sub_if_data *sdata, static struct sta_info *mesh_plink_alloc(struct ieee80211_sub_if_data *sdata,
u8 *hw_addr, u32 rates) u8 *hw_addr, u32 rates,
struct ieee802_11_elems *elems)
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
struct ieee80211_supported_band *sband;
struct sta_info *sta; struct sta_info *sta;
sband = local->hw.wiphy->bands[local->oper_channel->band];
if (local->num_sta >= MESH_MAX_PLINKS) if (local->num_sta >= MESH_MAX_PLINKS)
return NULL; return NULL;
@@ -96,6 +100,9 @@ static struct sta_info *mesh_plink_alloc(struct ieee80211_sub_if_data *sdata,
set_sta_flag(sta, WLAN_STA_AUTHORIZED); set_sta_flag(sta, WLAN_STA_AUTHORIZED);
set_sta_flag(sta, WLAN_STA_WME); set_sta_flag(sta, WLAN_STA_WME);
sta->sta.supp_rates[local->hw.conf.channel->band] = rates; sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
if (elems->ht_cap_elem)
ieee80211_ht_cap_ie_to_sta_ht_cap(sband, elems->ht_cap_elem,
&sta->sta.ht_cap);
rate_control_rate_init(sta); rate_control_rate_init(sta);
return sta; return sta;
@@ -276,7 +283,7 @@ void mesh_neighbour_update(u8 *hw_addr, u32 rates,
elems->ie_start, elems->total_len, elems->ie_start, elems->total_len,
GFP_KERNEL); GFP_KERNEL);
else else
sta = mesh_plink_alloc(sdata, hw_addr, rates); sta = mesh_plink_alloc(sdata, hw_addr, rates, elems);
if (!sta) if (!sta)
return; return;
if (sta_info_insert_rcu(sta)) { if (sta_info_insert_rcu(sta)) {
@@ -567,7 +574,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
} }
rates = ieee80211_sta_get_rates(local, &elems, rx_status->band); rates = ieee80211_sta_get_rates(local, &elems, rx_status->band);
sta = mesh_plink_alloc(sdata, mgmt->sa, rates); sta = mesh_plink_alloc(sdata, mgmt->sa, rates, &elems);
if (!sta) { if (!sta) {
mpl_dbg("Mesh plink error: plink table full\n"); mpl_dbg("Mesh plink error: plink table full\n");
return; return;