Commit 1617bab8 authored by Marco Porsch's avatar Marco Porsch Committed by Johannes Berg
Browse files

mac80211: update mesh peer link counter during userspace peering 



The established peer link count is indicated in mesh beacons and
used for other internal tasks. Previously it was not updated when
authenticated peering is performed in userspace.

Signed-off-by: default avatarMarco Porsch <marco@cozybit.com>
Acked-by: default avatarThomas Pedersen <thomas@cozybit.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ea54fba2

net/mac80211/cfg.c

+19 −3
Original line number Diff line number Diff line
@@ -1243,18 +1243,33 @@ static int sta_apply_parameters(struct ieee80211_local *local, 


	if (ieee80211_vif_is_mesh(&sdata->vif)) {

#ifdef CONFIG_MAC80211_MESH

		if (sdata->u.mesh.security & IEEE80211_MESH_SEC_SECURED)

		if (sdata->u.mesh.security & IEEE80211_MESH_SEC_SECURED) {

			u32 changed = 0;



			switch (params->plink_state) {

			case NL80211_PLINK_LISTEN:

			case NL80211_PLINK_ESTAB:

				if (sta->plink_state != NL80211_PLINK_ESTAB)

					changed = mesh_plink_inc_estab_count(

							sdata);

				sta->plink_state = params->plink_state;

				break;

			case NL80211_PLINK_LISTEN:

			case NL80211_PLINK_BLOCKED:

			case NL80211_PLINK_OPN_SNT:

			case NL80211_PLINK_OPN_RCVD:

			case NL80211_PLINK_CNF_RCVD:

			case NL80211_PLINK_HOLDING:

				if (sta->plink_state == NL80211_PLINK_ESTAB)

					changed = mesh_plink_dec_estab_count(

							sdata);

				sta->plink_state = params->plink_state;

				break;

			default:

				/*  nothing  */

				break;

			}

		else

			ieee80211_bss_info_change_notify(sdata, changed);

		} else {

			switch (params->plink_action) {

			case PLINK_ACTION_OPEN:

				mesh_plink_open(sta);
@@ -1263,6 +1278,7 @@ static int sta_apply_parameters(struct ieee80211_local *local, 
				mesh_plink_block(sta);

				break;

			}

		}

#endif

	}

net/mac80211/mesh.h

+14 −0
Original line number Diff line number Diff line
@@ -307,6 +307,20 @@ extern int mesh_paths_generation; 
#ifdef CONFIG_MAC80211_MESH

extern int mesh_allocated;



static inline

u32 mesh_plink_inc_estab_count(struct ieee80211_sub_if_data *sdata)

{

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

	return mesh_accept_plinks_update(sdata);

}



static inline

u32 mesh_plink_dec_estab_count(struct ieee80211_sub_if_data *sdata)

{

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

	return mesh_accept_plinks_update(sdata);

}



static inline int mesh_plink_free_count(struct ieee80211_sub_if_data *sdata)

{

	return sdata->u.mesh.mshcfg.dot11MeshMaxPeerLinks -

net/mac80211/mesh_plink.c

+0 −14
Original line number Diff line number Diff line
@@ -41,20 +41,6 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata, 
		enum ieee80211_self_protected_actioncode action,

		u8 *da, __le16 llid, __le16 plid, __le16 reason);



static inline

u32 mesh_plink_inc_estab_count(struct ieee80211_sub_if_data *sdata)

{

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

	return mesh_accept_plinks_update(sdata);

}



static inline

u32 mesh_plink_dec_estab_count(struct ieee80211_sub_if_data *sdata)

{

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

	return mesh_accept_plinks_update(sdata);

}



/**

 * mesh_plink_fsm_restart - restart a mesh peer link finite state machine

 *