Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1258d976 authored by Ashok Nagarajan's avatar Ashok Nagarajan Committed by Johannes Berg
Browse files

mac80211: move out the non-statistics variable estab_plinks from mesh_stat 



estab_plinks is not a statistics member. Hence move estab_plinks from
struct mesh_stat to struct ieee80211_if_mesh

Signed-off-by: default avatarAshok Nagarajan <ashok@cozybit.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent eea57d42

net/mac80211/debugfs_netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ IEEE80211_IF_FILE(dropped_frames_congestion, 
		  u.mesh.mshstats.dropped_frames_congestion, DEC);

IEEE80211_IF_FILE(dropped_frames_no_route,

		  u.mesh.mshstats.dropped_frames_no_route, DEC);

IEEE80211_IF_FILE(estab_plinks, u.mesh.mshstats.estab_plinks, ATOMIC);

IEEE80211_IF_FILE(estab_plinks, u.mesh.estab_plinks, ATOMIC);



/* Mesh parameters */

IEEE80211_IF_FILE(dot11MeshMaxRetries,

net/mac80211/ieee80211_i.h

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,6 @@ struct mesh_stats { 
	__u32 dropped_frames_ttl;	/* Not transmitted since mesh_ttl == 0*/

	__u32 dropped_frames_no_route;	/* Not transmitted, no route found */

	__u32 dropped_frames_congestion;/* Not forwarded due to congestion */

	atomic_t estab_plinks;

};



#define PREQ_Q_F_START		0x1
@@ -599,6 +598,7 @@ struct ieee80211_if_mesh { 
	int preq_queue_len;

	struct mesh_stats mshstats;

	struct mesh_config mshcfg;

	atomic_t estab_plinks;

	u32 mesh_seqnum;

	bool accepting_plinks;

	int num_gates;

net/mac80211/mesh.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ mesh_add_meshconf_ie(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) 
	/* Authentication Protocol identifier */

	*pos++ = ifmsh->mesh_auth_id;

	/* Mesh Formation Info - number of neighbors */

	neighbors = atomic_read(&ifmsh->mshstats.estab_plinks);

	neighbors = atomic_read(&ifmsh->estab_plinks);

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

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

	*pos++ = neighbors << 1;

net/mac80211/mesh.h

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ extern int mesh_allocated; 
static inline int mesh_plink_free_count(struct ieee80211_sub_if_data *sdata)

{

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

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

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

}



static inline bool mesh_plink_availables(struct ieee80211_sub_if_data *sdata)

net/mac80211/mesh_plink.c

+2 −2
Original line number Diff line number Diff line
@@ -50,14 +50,14 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata, 
static inline

u32 mesh_plink_inc_estab_count(struct ieee80211_sub_if_data *sdata)

{

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

	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.mshstats.estab_plinks);

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

	return mesh_accept_plinks_update(sdata);

}