diff options
| author | Javier Cardona <javier@cozybit.com> | 2011-08-09 16:45:09 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-24 13:59:43 -0400 |
| commit | 699403dbd41998a56d1d92d612ac261e5085a99f (patch) | |
| tree | 6fc10331599a64887e7ac68474200ced5d02fb03 | |
| parent | 5ee68e5b39de5cefecf147c58711f8ab01c21231 (diff) | |
| download | linux-699403dbd41998a56d1d92d612ac261e5085a99f.tar.bz2 | |
{nl,mac}80211: add missing root mode meshconf entries
This fix allows userspace to mark a meshif as a root node.
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/debugfs_netdev.c | 2 | ||||
| -rw-r--r-- | net/wireless/nl80211.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c index 9ea7c0d0103f..75ece3d3b6dd 100644 --- a/net/mac80211/debugfs_netdev.c +++ b/net/mac80211/debugfs_netdev.c @@ -485,7 +485,7 @@ static void add_mesh_config(struct ieee80211_sub_if_data *sdata) MESHPARAMS_ADD(dot11MeshHWMPmaxPREQretries); MESHPARAMS_ADD(path_refresh_time); MESHPARAMS_ADD(min_discovery_timeout); - + MESHPARAMS_ADD(dot11MeshHWMPRootMode); #undef MESHPARAMS_ADD } #endif diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 2aa6a2189842..93ee888b1059 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3062,6 +3062,7 @@ static const struct nla_policy nl80211_meshconf_params_policy[NL80211_MESHCONF_A [NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT] = { .type = NLA_U32 }, [NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL] = { .type = NLA_U16 }, [NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME] = { .type = NLA_U16 }, + [NL80211_MESHCONF_HWMP_ROOTMODE] = { .type = NLA_U8 }, }; static const struct nla_policy |