aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh_hwmp.c
diff options
context:
space:
mode:
authorJavier Cardona <javier@cozybit.com>2011-08-09 19:45:11 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-24 13:59:43 -0400
commit16dd7267f460739b3e29d984e73f05c5ffe2b142 (patch)
tree2902dddb8d8ef045ae64bff734eb400bf8a23fb7 /net/mac80211/mesh_hwmp.c
parent0507e159a2b590666982b53ecf6fb2843a5bb423 (diff)
{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/mesh_hwmp.c')
-rw-r--r--net/mac80211/mesh_hwmp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index ae3de755fada..fd4f76a3e139 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -1045,8 +1045,11 @@ mesh_path_tx_root_frame(struct ieee80211_sub_if_data *sdata)
1045{ 1045{
1046 struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; 1046 struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
1047 u32 interval = ifmsh->mshcfg.dot11MeshHWMPRannInterval; 1047 u32 interval = ifmsh->mshcfg.dot11MeshHWMPRannInterval;
1048 u8 flags;
1048 1049
1049 mesh_path_sel_frame_tx(MPATH_RANN, 0, sdata->vif.addr, 1050 flags = (ifmsh->mshcfg.dot11MeshGateAnnouncementProtocol)
1051 ? RANN_FLAG_IS_GATE : 0;
1052 mesh_path_sel_frame_tx(MPATH_RANN, flags, sdata->vif.addr,
1050 cpu_to_le32(++ifmsh->sn), 1053 cpu_to_le32(++ifmsh->sn),
1051 0, NULL, 0, broadcast_addr, 1054 0, NULL, 0, broadcast_addr,
1052 0, sdata->u.mesh.mshcfg.element_ttl, 1055 0, sdata->u.mesh.mshcfg.element_ttl,