Add nl80211 commands to get and set o11s mesh networking parameters

The two new commands are NL80211_CMD_GET_MESH_PARAMS and
NL80211_CMD_SET_MESH_PARAMS. There is a new attribute enum,
NL80211_ATTR_MESH_PARAMS, which enumerates the various mesh configuration
parameters.

Moved struct mesh_config from mac80211/ieee80211_i.h to net/cfg80211.h.
nl80211_get_mesh_params and nl80211_set_mesh_params unpack the netlink messages
and ask the driver to get or set the configuration.  This is done via two new
function stubs, get_mesh_params and set_mesh_params, in struct cfg80211_ops.

Signed-off-by: Colin McCabe <colin@cozybit.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 69 insertions, 20 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 55e3a26510ed..91f56a48e2b4 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -951,6 +951,72 @@ static int ieee80211_dump_mpath(struct wiphy *wiphy, struct net_device *dev,
         rcu_read_unlock();
         return 0;
 }
+
+static int ieee80211_get_mesh_params(struct wiphy *wiphy,
+                                struct net_device *dev,
+                                struct mesh_config *conf)
+{
+        struct ieee80211_sub_if_data *sdata;
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        if (sdata->vif.type != NL80211_IFTYPE_MESH_POINT)
+                return -ENOTSUPP;
+        memcpy(conf, &(sdata->u.mesh.mshcfg), sizeof(struct mesh_config));
+        return 0;
+}
+
+static inline bool _chg_mesh_attr(enum nl80211_meshconf_params parm, u32 mask)
+{
+        return (mask >> (parm-1)) & 0x1;
+}
+
+static int ieee80211_set_mesh_params(struct wiphy *wiphy,
+                                struct net_device *dev,
+                                const struct mesh_config *nconf, u32 mask)
+{
+        struct mesh_config *conf;
+        struct ieee80211_sub_if_data *sdata;
+        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+
+        if (sdata->vif.type != NL80211_IFTYPE_MESH_POINT)
+                return -ENOTSUPP;
+
+        /* Set the config options which we are interested in setting */
+        conf = &(sdata->u.mesh.mshcfg);
+        if (_chg_mesh_attr(NL80211_MESHCONF_RETRY_TIMEOUT, mask))
+                conf->dot11MeshRetryTimeout = nconf->dot11MeshRetryTimeout;
+        if (_chg_mesh_attr(NL80211_MESHCONF_CONFIRM_TIMEOUT, mask))
+                conf->dot11MeshConfirmTimeout = nconf->dot11MeshConfirmTimeout;
+        if (_chg_mesh_attr(NL80211_MESHCONF_HOLDING_TIMEOUT, mask))
+                conf->dot11MeshHoldingTimeout = nconf->dot11MeshHoldingTimeout;
+        if (_chg_mesh_attr(NL80211_MESHCONF_MAX_PEER_LINKS, mask))
+                conf->dot11MeshMaxPeerLinks = nconf->dot11MeshMaxPeerLinks;
+        if (_chg_mesh_attr(NL80211_MESHCONF_MAX_RETRIES, mask))
+                conf->dot11MeshMaxRetries = nconf->dot11MeshMaxRetries;
+        if (_chg_mesh_attr(NL80211_MESHCONF_TTL, mask))
+                conf->dot11MeshTTL = nconf->dot11MeshTTL;
+        if (_chg_mesh_attr(NL80211_MESHCONF_AUTO_OPEN_PLINKS, mask))
+                conf->auto_open_plinks = nconf->auto_open_plinks;
+        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES, mask))
+                conf->dot11MeshHWMPmaxPREQretries =
+                        nconf->dot11MeshHWMPmaxPREQretries;
+        if (_chg_mesh_attr(NL80211_MESHCONF_PATH_REFRESH_TIME, mask))
+                conf->path_refresh_time = nconf->path_refresh_time;
+        if (_chg_mesh_attr(NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT, mask))
+                conf->min_discovery_timeout = nconf->min_discovery_timeout;
+        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT, mask))
+                conf->dot11MeshHWMPactivePathTimeout =
+                        nconf->dot11MeshHWMPactivePathTimeout;
+        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL, mask))
+                conf->dot11MeshHWMPpreqMinInterval =
+                        nconf->dot11MeshHWMPpreqMinInterval;
+        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
+                           mask))
+                conf->dot11MeshHWMPnetDiameterTraversalTime =
+                        nconf->dot11MeshHWMPnetDiameterTraversalTime;
+        return 0;
+}
+
 #endif
 
 static int ieee80211_change_bss(struct wiphy *wiphy,
@@ -1007,6 +1073,8 @@ struct cfg80211_ops mac80211_config_ops = {
         .change_mpath = ieee80211_change_mpath,
         .get_mpath = ieee80211_get_mpath,
         .dump_mpath = ieee80211_dump_mpath,
+        .set_mesh_params = ieee80211_set_mesh_params,
+        .get_mesh_params = ieee80211_get_mesh_params,
 #endif
         .change_bss = ieee80211_change_bss,
 };
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index fe4efdd4253d..2c91108e3901 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -23,6 +23,7 @@
 #include <linux/types.h>
 #include <linux/spinlock.h>
 #include <linux/etherdevice.h>
+#include <net/cfg80211.h>
 #include <net/wireless.h>
 #include <net/iw_handler.h>
 #include <net/mac80211.h>
@@ -247,26 +248,6 @@ struct mesh_preq_queue {
         u8 flags;
 };
 
-struct mesh_config {
-        /* Timeouts in ms */
-        /* Mesh plink management parameters */
-        u16 dot11MeshRetryTimeout;
-        u16 dot11MeshConfirmTimeout;
-        u16 dot11MeshHoldingTimeout;
-        u16 dot11MeshMaxPeerLinks;
-        u8  dot11MeshMaxRetries;
-        u8  dot11MeshTTL;
-        bool auto_open_plinks;
-        /* HWMP parameters */
-        u8  dot11MeshHWMPmaxPREQretries;
-        u32 path_refresh_time;
-        u16 min_discovery_timeout;
-        u32 dot11MeshHWMPactivePathTimeout;
-        u16 dot11MeshHWMPpreqMinInterval;
-        u16 dot11MeshHWMPnetDiameterTraversalTime;
-};
-
-
 /* flags used in struct ieee80211_if_sta.flags */
 #define IEEE80211_STA_SSID_SET          BIT(0)
 #define IEEE80211_STA_BSSID_SET         BIT(1)