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

Commit 66de6713 authored by Colleen Twitty's avatar Colleen Twitty Committed by Johannes Berg
Browse files

mac80211: expire mesh peers based on mesh configuration 



The time it takes to see the peer link expire may differ
by a minute since sta_expire() is run once a minute as a
mesh housekeeping task.

Signed-off-by: default avatarColleen Twitty <colleen@cozybit.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8e7c0538

net/mac80211/cfg.c

+2 −0
Original line number Diff line number Diff line
@@ -1871,6 +1871,8 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy, 
	if (_chg_mesh_attr(NL80211_MESHCONF_AWAKE_WINDOW, mask))

		conf->dot11MeshAwakeWindowDuration =

			nconf->dot11MeshAwakeWindowDuration;

	if (_chg_mesh_attr(NL80211_MESHCONF_PLINK_TIMEOUT, mask))

		conf->plink_timeout = nconf->plink_timeout;

	ieee80211_mbss_info_change_notify(sdata, BSS_CHANGED_BEACON);

	return 0;

}

net/mac80211/mesh.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata) 
	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;

	u32 changed;



	ieee80211_sta_expire(sdata, IEEE80211_MESH_PEER_INACTIVITY_LIMIT);

	ieee80211_sta_expire(sdata, ifmsh->mshcfg.plink_timeout * HZ);

	mesh_path_expire(sdata);



	changed = mesh_accept_plinks_update(sdata);

net/mac80211/mesh.h

+0 −1
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ struct mesh_rmc { 
	u32 idx_mask;

};



#define IEEE80211_MESH_PEER_INACTIVITY_LIMIT (1800 * HZ)

#define IEEE80211_MESH_HOUSEKEEPING_INTERVAL (60 * HZ)



#define MESH_PATH_EXPIRE (600 * HZ)