diff options
| author | Rui Paulo | 2009-11-10 00:46:57 +0100 |
|---|---|---|
| committer | John W. Linville | 2009-11-13 23:43:57 +0100 |
| commit | 63c5723bc3af8d4e86984dd4ff0c78218de418d0 (patch) | |
| tree | fe900ef2a92377c49c6b3124bb5741a1ac04d436 /net/mac80211/cfg.c | |
| parent | mac80211: implement a timer to send RANN action frames (diff) | |
| download | kernel-qcow2-linux-63c5723bc3af8d4e86984dd4ff0c78218de418d0.tar.gz kernel-qcow2-linux-63c5723bc3af8d4e86984dd4ff0c78218de418d0.tar.xz kernel-qcow2-linux-63c5723bc3af8d4e86984dd4ff0c78218de418d0.zip | |
mac80211: add nl80211/cfg80211 handling of the new mesh root mode option.
Signed-off-by: Rui Paulo <rpaulo@gmail.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Reviewed-by: Andrey Yurovsky <andrey@cozybit.com>
Tested-by: Brian Cavagnolo <brian@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 81053587e72b..7f18c8fa1880 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1029,7 +1029,10 @@ static int ieee80211_set_mesh_params(struct wiphy *wiphy, { struct mesh_config *conf; struct ieee80211_sub_if_data *sdata; + struct ieee80211_if_mesh *ifmsh; + sdata = IEEE80211_DEV_TO_SUB_IF(dev); + ifmsh = &sdata->u.mesh; /* Set the config options which we are interested in setting */ conf = &(sdata->u.mesh.mshcfg); @@ -1064,6 +1067,10 @@ static int ieee80211_set_mesh_params(struct wiphy *wiphy, mask)) conf->dot11MeshHWMPnetDiameterTraversalTime = nconf->dot11MeshHWMPnetDiameterTraversalTime; + if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_ROOTMODE, mask)) { + conf->dot11MeshHWMPRootMode = nconf->dot11MeshHWMPRootMode; + ieee80211_mesh_root_setup(ifmsh); + } return 0; } |