summaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorJavier Cardona2011-08-10 01:45:10 +0200
committerJohn W. Linville2011-08-24 19:59:43 +0200
commit0507e159a2b590666982b53ecf6fb2843a5bb423 (patch)
treea5c0aefae3ea789fb1b0ef9019372e534b93aecc /net/mac80211/cfg.c
parent{nl,mac}80211: add missing root mode meshconf entries (diff)
downloadkernel-qcow2-linux-0507e159a2b590666982b53ecf6fb2843a5bb423.tar.gz
kernel-qcow2-linux-0507e159a2b590666982b53ecf6fb2843a5bb423.tar.xz
kernel-qcow2-linux-0507e159a2b590666982b53ecf6fb2843a5bb423.zip
{nl,cfg,mac}80211: let userspace set RANN interval
Allow userspace to set Root Announcement Interval for our mesh interface. Also, RANN interval is now in proper units of TUs. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index c1fa5775cef2..9995c83c2420 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1137,6 +1137,10 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
conf->dot11MeshHWMPRootMode = nconf->dot11MeshHWMPRootMode;
ieee80211_mesh_root_setup(ifmsh);
}
+ if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask)) {
+ conf->dot11MeshHWMPRannInterval =
+ nconf->dot11MeshHWMPRannInterval;
+ }
return 0;
}