From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-iy0-f170.google.com ([209.85.210.170]:52194 "EHLO mail-iy0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751921Ab1HIXqb (ORCPT ); Tue, 9 Aug 2011 19:46:31 -0400 Received: by mail-iy0-f170.google.com with SMTP id 16so23646iye.1 for ; Tue, 09 Aug 2011 16:46:31 -0700 (PDT) From: Thomas Pedersen To: linux-wireless@vger.kernel.org Cc: Javier Cardona , johannes@sipsolutions.net, linville@tuxdriver.com Subject: [PATCH 6/8] {nl,mac}80211: add missing root mode meshconf entries Date: Tue, 9 Aug 2011 16:45:09 -0700 Message-Id: <1312933511-9486-7-git-send-email-thomas@cozybit.com> (sfid-20110810_014636_324001_BCA44A6A) In-Reply-To: <1312933511-9486-1-git-send-email-thomas@cozybit.com> References: <1312933511-9486-1-git-send-email-thomas@cozybit.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Javier Cardona This fix allows userspace to mark a meshif as a root node. Signed-off-by: Javier Cardona --- net/mac80211/debugfs_netdev.c | 2 +- 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 9ea7c0d..75ece3d 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 e83e7fe..c7b5e44 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2982,6 +2982,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 -- 1.7.6