summaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorJavier Cardona2011-08-10 01:45:11 +0200
committerJohn W. Linville2011-08-24 19:59:43 +0200
commit16dd7267f460739b3e29d984e73f05c5ffe2b142 (patch)
tree2902dddb8d8ef045ae64bff734eb400bf8a23fb7 /net/mac80211/cfg.c
parent{nl,cfg,mac}80211: let userspace set RANN interval (diff)
downloadkernel-qcow2-linux-16dd7267f460739b3e29d984e73f05c5ffe2b142.tar.gz
kernel-qcow2-linux-16dd7267f460739b3e29d984e73f05c5ffe2b142.tar.xz
kernel-qcow2-linux-16dd7267f460739b3e29d984e73f05c5ffe2b142.zip
{nl,cfg,mac}80211: let userspace make meshif mesh gate
Allow userspace to set NL80211_MESHCONF_GATE_ANNOUNCEMENTS attribute, which will advertise this mesh node as being a mesh gate. NL80211_HWMP_ROOTMODE must be set or this will do nothing. 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 9995c83c2420..7d17a9183b8a 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_GATE_ANNOUNCEMENTS, mask)) {
+ conf->dot11MeshGateAnnouncementProtocol =
+ nconf->dot11MeshGateAnnouncementProtocol;
+ }
if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask)) {
conf->dot11MeshHWMPRannInterval =
nconf->dot11MeshHWMPRannInterval;