Commit 8f2fda95 authored by Rui Paulo's avatar Rui Paulo Committed by John W. Linville
Browse files

mac80211: implement the meshconf formation info field 



The Mesh Configuration Formation Info field contains the number of
neighbors.  This means that the beacon must be updated every time a
peer joins or leaves.

Signed-off-by: default avatarRui Paulo <rpaulo@gmail.com>
Signed-off-by: default avatarJavier Cardona <rpaulo@gmail.com>
Reviewed-by: default avatarAndrey Yurovsky <andrey@cozybit.com>
Tested-by: default avatarBrian Cavagnolo <brian@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a1935218

net/mac80211/mesh.c

+6 −3
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ void mesh_mgmt_ies_add(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) 
	struct ieee80211_supported_band *sband;

	u8 *pos;

	int len, i, rate;

	u8 neighbors;



	sband = local->hw.wiphy->bands[local->hw.conf.channel->band];

	len = sband->n_bitrates;
@@ -271,9 +272,11 @@ void mesh_mgmt_ies_add(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) 
	/* Authentication Protocol identifier */

	*pos++ = sdata->u.mesh.mesh_auth_id;



	/* Mesh Formation Info */

	memset(pos, 0x00, 1);

	pos += 1;

	/* Mesh Formation Info - number of neighbors */

	neighbors = atomic_read(&sdata->u.mesh.mshstats.estab_plinks);

	/* Number of neighbor mesh STAs or 15 whichever is smaller */

	neighbors = (neighbors > 15) ? 15 : neighbors;

	*pos++ = neighbors << 1;



	/* Mesh capability */

	sdata->u.mesh.accepting_plinks = mesh_plink_availables(sdata);

net/mac80211/mesh_plink.c

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ void mesh_plink_inc_estab_count(struct ieee80211_sub_if_data *sdata) 
{

	atomic_inc(&sdata->u.mesh.mshstats.estab_plinks);

	mesh_accept_plinks_update(sdata);

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON);

}



static inline
@@ -72,6 +73,7 @@ void mesh_plink_dec_estab_count(struct ieee80211_sub_if_data *sdata) 
{

	atomic_dec(&sdata->u.mesh.mshstats.estab_plinks);

	mesh_accept_plinks_update(sdata);

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE