{nl,cfg,mac}80211: let userspace set RANN interval

[mirror_ubuntu-bionic-kernel.git] / net / mac80211 / mesh.c

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index e120fefb4e4030bb12fbe77c59eb3b13d3843530..1c4f53c31ae5259427b2a99d796df3cef48bcdc4 100644 (file)
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -537,7 +537,8 @@ static void ieee80211_mesh_rootpath(struct ieee80211_sub_if_data *sdata)
 
        mesh_path_tx_root_frame(sdata);
        mod_timer(&ifmsh->mesh_path_root_timer,
-                 round_jiffies(jiffies + IEEE80211_MESH_RANN_INTERVAL));
+                 round_jiffies(jiffies +
+                         usecs_to_jiffies(ifmsh->mshcfg.dot11MeshHWMPRannInterval * 1024)));
 }
 
 #ifdef CONFIG_PM