@@ -1027,6 +1027,9 @@ static void sta_apply_mesh_params(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata = sta->sdata;
u32 changed = 0;
+ if (params->aid)
+ set_bit(params->aid, sdata->u.mesh.aid_map);
+
if (params->sta_modify_mask & STATION_PARAM_APPLY_PLINK_STATE) {
switch (params->plink_state) {
case NL80211_PLINK_ESTAB:
@@ -689,6 +689,7 @@ struct ieee80211_if_mesh {
int ps_peers_light_sleep;
int ps_peers_deep_sleep;
struct ps_data ps;
+ DECLARE_BITMAP(aid_map, IEEE80211_MAX_AID + 1);
/* Channel Switching Support */
struct mesh_csa_settings __rcu *csa;
enum {
@@ -150,6 +150,9 @@ void mesh_sta_cleanup(struct sta_info *sta)
struct ieee80211_sub_if_data *sdata = sta->sdata;
u32 changed;
+ if (sta->sta.aid)
+ clear_bit(sta->sta.aid, sdata->u.mesh.aid_map);
+
/*
* maybe userspace handles peer allocation and peering, but in either
* case the beacon is still generated by the kernel and we might need
@@ -1323,6 +1326,10 @@ void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)
ifmsh->accepting_plinks = true;
atomic_set(&ifmsh->mpaths, 0);
mesh_rmc_init(sdata);
+
+ /* reserve aid 0 used for mcast indication */
+ set_bit(0, ifmsh->aid_map);
+
ifmsh->last_preq = jiffies;
ifmsh->next_perr = jiffies;
ifmsh->csa_role = IEEE80211_MESH_CSA_ROLE_NONE;
@@ -421,20 +421,43 @@ out:
spin_unlock_bh(&sta->mesh->plink_lock);
}
+static int mesh_allocate_aid(struct ieee80211_sub_if_data *sdata)
+{
+ int aid;
+
+ /* mark first empty bit as used in aid_map and return it */
+ do {
+ aid = find_first_zero_bit(sdata->u.mesh.aid_map,
+ IEEE80211_MAX_AID + 1);
+ } while (aid <= IEEE80211_MAX_AID &&
+ test_and_set_bit(aid, sdata->u.mesh.aid_map));
+
+ if (aid > IEEE80211_MAX_AID)
+ return -ENOBUFS;
+
+ return aid;
+}
+
static struct sta_info *
__mesh_sta_info_alloc(struct ieee80211_sub_if_data *sdata, u8 *hw_addr)
{
struct sta_info *sta;
+ int aid;
if (sdata->local->num_sta >= MESH_MAX_PLINKS)
return NULL;
+ aid = mesh_allocate_aid(sdata);
+ if (aid < 0)
+ return NULL;
+
sta = sta_info_alloc(sdata, hw_addr, GFP_KERNEL);
if (!sta)
return NULL;
sta->mesh->plink_state = NL80211_PLINK_LISTEN;
sta->sta.wme = true;
+ sta->sta.aid = aid;
sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
@@ -658,8 +681,6 @@ static u16 mesh_get_new_llid(struct ieee80211_sub_if_data *sdata)
do {
get_random_bytes(&llid, sizeof(llid));
- /* for mesh PS we still only have the AID range for TIM bits */
- llid = (llid % IEEE80211_MAX_AID) + 1;
} while (llid_in_use(sdata, llid));
return llid;
@@ -1068,7 +1089,6 @@ mesh_process_plink_frame(struct ieee80211_sub_if_data *sdata,
goto unlock_rcu;
}
sta->mesh->plid = plid;
- sta->sta.aid = plid;
} else if (!sta && event == OPN_RJCT) {
mesh_plink_frame_tx(sdata, NULL, WLAN_SP_MESH_PEERING_CLOSE,
mgmt->sa, 0, plid,
@@ -1080,10 +1100,8 @@ mesh_process_plink_frame(struct ieee80211_sub_if_data *sdata,
}
/* 802.11-2012 13.3.7.2 - update plid on CNF if not set */
- if (!sta->mesh->plid && event == CNF_ACPT) {
+ if (!sta->mesh->plid && event == CNF_ACPT)
sta->mesh->plid = plid;
- sta->sta.aid = sta->mesh->plid;
- }
changed |= mesh_plink_fsm(sdata, sta, event);
Instead of using peer link id for AID, generate a new AID when creating mesh STAs in the kernel peering manager. This enables smaller TIM elements and more closely follows the standard, and it also enables mesh to work on drivers that require a valid AID when the STA is inserted (ath10k firmware has this requirement, for example). In the case of userspace-managed stations, we use the AID from NL80211_CMD_NEW_STATION. Signed-off-by: Bob Copeland <me@bobcopeland.com> --- net/mac80211/cfg.c | 3 +++ net/mac80211/ieee80211_i.h | 1 + net/mac80211/mesh.c | 7 +++++++ net/mac80211/mesh_plink.c | 30 ++++++++++++++++++++++++------ 4 files changed, 35 insertions(+), 6 deletions(-)