On Thu, 2012-06-07 at 12:39 +0800, Chun-Yeow Yeoh wrote:
> mesh_path_root_timer is invoked once the dot11MeshHWMPRootMode is larger than 1. This patch
> also adds the backward compatible to the previous setting on dot11MeshHWMPRootMode. If the
> user configures as follow, it will still trigger the proactive RANN with Gate Announcement.
>
> iw mesh0 set mesh_param mesh_hwmp_rootmode 1
> iw mesh0 set mesh_param mesh_gate_announcements 1
>
> similar to the following setting:
>
> iw mesh0 set mesh_param mesh_hwmp_rootmode 4
> iw mesh0 set mesh_param mesh_gate_announcements 1
>
> Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@xxxxxxxxx>
> ---
> v2: use constant for dot11MeshHWMPRootMode assignment (Johannes)
>
> net/mac80211/cfg.c | 4 ++--
> net/mac80211/mesh.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
> index 38e743f..85c6601 100644
> --- a/net/mac80211/cfg.c
> +++ b/net/mac80211/cfg.c
> @@ -1564,8 +1564,8 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
> * announcements, so require this ifmsh to also be a root node
> * */
> if (nconf->dot11MeshGateAnnouncementProtocol &&
> - !conf->dot11MeshHWMPRootMode) {
> - conf->dot11MeshHWMPRootMode = 1;
> + !(conf->dot11MeshHWMPRootMode > 1)) {
> + conf->dot11MeshHWMPRootMode = IEEE80211_PROACTIVE_RANN;
so, humm, there's still the same constant here.
> - if (ifmsh->mshcfg.dot11MeshHWMPRootMode)
> + if (ifmsh->mshcfg.dot11MeshHWMPRootMode > 1)
and here.
johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
