commit 66de671374f003467b5ef7c65ecbe1930480c8c9
author Colleen Twitty <colleen@cozybit.com> Mon Jun 03 09:53:40 2013 -0700
committer Johannes Berg <johannes.berg@intel.com> Tue Jun 11 14:16:29 2013 +0200
tree 1cf849085a6c8b7c0aeb1b2329dbf53c8c605f73
parent 8e7c053853b7d299e8a2b8733659b0df8eee51f7

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: Colleen Twitty <colleen@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

net/mac80211/cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 3062210..344a579 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1871,6 +1871,8 @@
 	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

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index d5faf91..4ee527f 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -575,7 +575,7 @@
 	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

diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index 8b4d9a3..01a28bc 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -188,7 +188,6 @@
 	u32 idx_mask;
 };
 
-#define IEEE80211_MESH_PEER_INACTIVITY_LIMIT (1800 * HZ)
 #define IEEE80211_MESH_HOUSEKEEPING_INTERVAL (60 * HZ)
 
 #define MESH_PATH_EXPIRE (600 * HZ)