summaryrefslogtreecommitdiff
path: root/net/mac80211/mesh.c
diff options
context:
space:
mode:
authorColleen Twitty <colleen@cozybit.com>2013-06-03 20:53:40 +0400
committerJohannes Berg <johannes.berg@intel.com>2013-06-11 16:16:29 +0400
commit66de671374f003467b5ef7c65ecbe1930480c8c9 (patch)
tree1cf849085a6c8b7c0aeb1b2329dbf53c8c605f73 /net/mac80211/mesh.c
parent8e7c053853b7d299e8a2b8733659b0df8eee51f7 (diff)
downloadlinux-66de671374f003467b5ef7c65ecbe1930480c8c9.tar.xz
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>
Diffstat (limited to 'net/mac80211/mesh.c')
-rw-r--r--net/mac80211/mesh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index d5faf91632c1..4ee527f78677 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -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);