mesh improvements
Subsystems (2)
Johannes Berg
maintainercover mesh improvements
Ok so this is the final versions of the mesh patches we've been working on.
I replaced my first patch with Javier's, so that we no longer hardcode any TTL but the element TTL is also configurable.
Now you can join/leave meshes on the fly, and we can work on adding more setup to creating the mesh, like the beacon IEs Javier had an interest in. Another easy target would be the beacon interval, for example.
I think eventually this should be extended a bit further in that drivers would need the ability to advertise which of the mesh config parameters they support. mac80211 currently supports all of them, but I could see that change with newer drafts, and I can also see not all devices (like libertas...) supporting all possible parameters.
johannes
Johannes Berg
maintainerPATCH 1/5 nl80211/mac80211: define and allow configuring mesh element TTL
From: Javier Cardona <[email protected]>
The TTL in path selection information elements is different from the mesh ttl used in mesh data frames. Version 7.03 of the 11s draft calls this ttl 'Element TTL'.
--- include/linux/nl80211.h | 4 ++++ include/net/cfg80211.h | 2 ++ net/mac80211/cfg.c | 2 ++ net/mac80211/debugfs_netdev.c | 2 ++ net/mac80211/mesh.c | 1 + net/mac80211/mesh.h | 2 ++ net/mac80211/mesh_hwmp.c | 9 +++++---- net/mac80211/mesh_pathtbl.c | 7 ++++--- net/wireless/nl80211.c | 5 +++++ 9 files changed, 27 insertions(+), 7 deletions(-)
include/linux/nl80211.h +4 -0
@@ -1547,6 +1547,9 @@ enum nl80211_mntr_flags {* @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh * point. * +* @NL80211_MESHCONF_ELEMENT_TTL: specifies the value of TTL field set at a +* source mesh point for path selection elements. +* * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically * open peer links when we detect compatible mesh peers. *
@@ -1593,6 +1596,7 @@ enum nl80211_meshconf_params {NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL ,NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME ,NL80211_MESHCONF_HWMP_ROOTMODE , +NL80211_MESHCONF_ELEMENT_TTL ,/* keep last */ __NL80211_MESHCONF_ATTR_AFTER_LAST,
include/net/cfg80211.h +2 -0
@@ -624,6 +624,8 @@ struct mesh_config {u16 dot11MeshMaxPeerLinks;u8 dot11MeshMaxRetries;u8 dot11MeshTTL; +/* ttl used in path selection information elements */ +u8 element_ttl;bool auto_open_plinks;/* HWMP parameters */ u8 dot11MeshHWMPmaxPREQretries;
net/mac80211/cfg.c +2 -0
@@ -1024,6 +1024,8 @@ static int ieee80211_set_mesh_params(str conf->dot11MeshMaxRetries = nconf->dot11MeshMaxRetries;if (_chg_mesh_attr (NL80211_MESHCONF_TTL , mask)) conf->dot11MeshTTL = nconf->dot11MeshTTL; +if (_chg_mesh_attr (NL80211_MESHCONF_ELEMENT_TTL , mask)) + conf->dot11MeshTTL = nconf->element_ttl;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))
net/mac80211/debugfs_netdev.c +2 -0
@@ -251,6 +251,7 @@ IEEE80211_IF_FILE(dot11MeshConfirmTimeouIEEE80211_IF_FILE (dot11MeshHoldingTimeout, u.mesh.mshcfg.dot11MeshHoldingTimeout,DEC );IEEE80211_IF_FILE (dot11MeshTTL, u.mesh.mshcfg.dot11MeshTTL,DEC ); +IEEE80211_IF_FILE (element_ttl, u.mesh.mshcfg.element_ttl,DEC );IEEE80211_IF_FILE (auto_open_plinks, u.mesh.mshcfg.auto_open_plinks,DEC );IEEE80211_IF_FILE (dot11MeshMaxPeerLinks, u.mesh.mshcfg.dot11MeshMaxPeerLinks,DEC );
@@ -355,6 +356,7 @@ static void add_mesh_config(struct ieee8MESHPARAMS_ADD (dot11MeshConfirmTimeout);MESHPARAMS_ADD (dot11MeshHoldingTimeout);MESHPARAMS_ADD (dot11MeshTTL); +MESHPARAMS_ADD (element_ttl);MESHPARAMS_ADD (auto_open_plinks);MESHPARAMS_ADD (dot11MeshMaxPeerLinks);MESHPARAMS_ADD (dot11MeshHWMPactivePathTimeout);
net/mac80211/mesh.c +1 -0
@@ -668,6 +668,7 @@ void ieee80211_mesh_init_sdata(struct ie ifmsh->mshcfg.dot11MeshHoldingTimeout =MESH_HOLD_T ; ifmsh->mshcfg.dot11MeshMaxRetries =MESH_MAX_RETR ; ifmsh->mshcfg.dot11MeshTTL =MESH_TTL ; + ifmsh->mshcfg.element_ttl =MESH_DEFAULT_ELEMENT_TTL ; ifmsh->mshcfg.auto_open_plinks = true; ifmsh->mshcfg.dot11MeshMaxPeerLinks =MESH_MAX_ESTAB_PLINKS ;
net/mac80211/mesh.h +2 -0
@@ -216,6 +216,8 @@ struct mesh_rmc {#define PERR_RCODE_NO_ROUTE 12#define PERR_RCODE_DEST_UNREACH 13 +#define MESH_DEFAULT_ELEMENT_TTL 31 +/* Public interfaces */ /* Various */ int ieee80211_fill_mesh_addresses(struct ieee80211_hdr *hdr, __le16 *fc,
net/mac80211/mesh_hwmp.c +5 -4
@@ -232,7 +232,7 @@ int mesh_path_error_tx(u8 ttl, u8 *targe *pos++ =WLAN_EID_PERR ; *pos++ = ie_len;/* ttl */ - *pos++ =MESH_TTL ; + *pos++ = ttl;/* number of destinations */ *pos++ =1 ;/*
@@ -522,7 +522,7 @@ static void hwmp_preq_frame_process(struif (reply) { lifetime =PREQ_IE_LIFETIME (preq_elem); - ttl = ifmsh->mshcfg.dot11MeshTTL; + ttl = ifmsh->mshcfg.element_ttl;if (ttl !=0 ) {mhwmp_dbg ("replying to the PREQ\n" ); mesh_path_sel_frame_tx(MPATH_PREP, 0, target_addr,
@@ -877,7 +877,7 @@ void mesh_path_start_discovery(struct ie sdata->u.mesh.last_sn_update = jiffies; } lifetime =default_lifetime (sdata); - ttl = sdata->u.mesh.mshcfg.dot11MeshTTL; + ttl = sdata->u.mesh.mshcfg.element_ttl;if (ttl ==0 ) { sdata->u.mesh.mshstats.dropped_frames_ttl++;spin_unlock_bh (&mpath->state_lock);
@@ -1013,5 +1013,6 @@ mesh_path_tx_root_frame(struct ieee80211mesh_path_sel_frame_tx (MPATH_RANN ,0 , sdata->vif.addr,cpu_to_le32 (++ifmsh->sn),0 ,NULL ,0 , broadcast_addr, -0 ,MESH_TTL ,0 ,0 ,0 , sdata); +0 , sdata->u.mesh.mshcfg.element_ttl, +0 ,0 ,0 , sdata); }
net/mac80211/mesh_pathtbl.c +4 -3
@@ -467,8 +467,8 @@ void mesh_plink_broken(struct sta_info * mpath->flags &= ~MESH_PATH_ACTIVE ; ++mpath->sn;spin_unlock_bh (&mpath->state_lock); -mesh_path_error_tx (MESH_TTL , mpath->dst, -cpu_to_le32 (mpath->sn), +mesh_path_error_tx (sdata->u.mesh.mshcfg.element_ttl, + mpath->dst,cpu_to_le32 (mpath->sn),cpu_to_le16 (PERR_RCODE_DEST_UNREACH ), bcast, sdata); }else
@@ -614,7 +614,8 @@ void mesh_path_discard_frame(struct sk_b mpath =mesh_path_lookup (da, sdata);if (mpath) sn = ++mpath->sn; -mesh_path_error_tx (MESH_TTL , skb->data,cpu_to_le32 (sn), +mesh_path_error_tx (sdata->u.mesh.mshcfg.element_ttl, skb->data, +cpu_to_le32 (sn),cpu_to_le16 (PERR_RCODE_NO_ROUTE ), ra, sdata); }
net/wireless/nl80211.c +5 -0
@@ -2582,6 +2582,8 @@ static int nl80211_get_mesh_params(struc cur_params.dot11MeshMaxRetries);NLA_PUT_U8 (msg,NL80211_MESHCONF_TTL , cur_params.dot11MeshTTL); +NLA_PUT_U8 (msg,NL80211_MESHCONF_ELEMENT_TTL , + cur_params.element_ttl);NLA_PUT_U8 (msg,NL80211_MESHCONF_AUTO_OPEN_PLINKS , cur_params.auto_open_plinks); NLA_PUT_U8(msg, NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,
@@ -2623,6 +2625,7 @@ static const struct nla_policy nl80211_m [NL80211_MESHCONF_MAX_PEER_LINKS] = { .type = NLA_U16 }, [NL80211_MESHCONF_MAX_RETRIES] = { .type = NLA_U8 }, [NL80211_MESHCONF_TTL] = { .type = NLA_U8 }, + [NL80211_MESHCONF_ELEMENT_TTL] = { .type = NLA_U8 }, [NL80211_MESHCONF_AUTO_OPEN_PLINKS] = { .type = NLA_U8 }, [NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES] = { .type = NLA_U8 },
@@ -2670,6 +2673,8 @@ static int nl80211_set_mesh_params(struc mask, NL80211_MESHCONF_MAX_RETRIES, nla_get_u8);FILL_IN_MESH_PARAM_IF_SET (tb, cfg, dot11MeshTTL, mask,NL80211_MESHCONF_TTL , nla_get_u8); +FILL_IN_MESH_PARAM_IF_SET (tb, cfg, element_ttl, + mask,NL80211_MESHCONF_ELEMENT_TTL , nla_get_u8);FILL_IN_MESH_PARAM_IF_SET (tb, cfg, auto_open_plinks, mask,NL80211_MESHCONF_AUTO_OPEN_PLINKS , nla_get_u8); FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPmaxPREQretries,
Johannes Berg
maintainerPATCH 2/5 mac80211: move mesh filter adjusting
In reply to Johannes BergFrom: Johannes Berg <[email protected]>
Logically, the filter adjusting belongs with starting/stopping mesh, not interface up/down, so move it there.
--- net/mac80211/iface.c | 18 +----------------- net/mac80211/mesh.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 17 deletions(-)
net/mac80211/iface.c +1 -17
@@ -197,11 +197,6 @@ static int ieee80211_do_open(struct net_ sdata->bss = &sdata->u.ap;break ;case NL80211_IFTYPE_MESH_POINT : -if (!ieee80211_vif_is_mesh (&sdata->vif)) -break ; -/* mesh ifaces must set allmulti to forward mcast traffic */ -atomic_inc (&local->iff_allmultis); -break ;case NL80211_IFTYPE_STATION :case NL80211_IFTYPE_MONITOR :case NL80211_IFTYPE_ADHOC :
@@ -274,9 +269,6 @@ static int ieee80211_do_open(struct net_ }if (ieee80211_vif_is_mesh (&sdata->vif)) { - local->fif_other_bss++; -ieee80211_configure_filter (local); -ieee80211_start_mesh (sdata); }else if (sdata->vif.type ==NL80211_IFTYPE_AP ) { local->fif_pspoll++;
@@ -504,16 +496,8 @@ static void ieee80211_do_stop(struct ieeieee80211_configure_filter (local);break ;case NL80211_IFTYPE_MESH_POINT : -if (ieee80211_vif_is_mesh (&sdata->vif)) { -/* other_bss and allmulti are always set on mesh -* ifaces */ - local->fif_other_bss--; -atomic_dec (&local->iff_allmultis); - -ieee80211_configure_filter (local); - +if (ieee80211_vif_is_mesh (&sdata->vif))ieee80211_stop_mesh (sdata); - }/* fall through */ default :flush_work (&sdata->work);
net/mac80211/mesh.c +11 -0
@@ -513,6 +513,11 @@ void ieee80211_start_mesh(struct ieee802struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;struct ieee80211_local *local = sdata->local; + local->fif_other_bss++; +/* mesh ifaces must set allmulti to forward mcast traffic */ +atomic_inc (&local->iff_allmultis); +ieee80211_configure_filter (local); +set_bit (MESH_WORK_HOUSEKEEPING , &ifmsh->wrkq_flags);ieee80211_mesh_root_setup (ifmsh);ieee80211_queue_work (&local->hw, &sdata->work);
@@ -524,6 +529,8 @@ void ieee80211_start_mesh(struct ieee802void ieee80211_stop_mesh (struct ieee80211_sub_if_data *sdata) { +struct ieee80211_local *local = sdata->local; +del_timer_sync (&sdata->u.mesh.housekeeping_timer);del_timer_sync (&sdata->u.mesh.mesh_path_root_timer);/*
@@ -534,6 +541,10 @@ void ieee80211_stop_mesh(struct ieee8021* it no longer is. */ cancel_work_sync (&sdata->work); + + local->fif_other_bss--; +atomic_dec (&local->iff_allmultis); +ieee80211_configure_filter (local); } static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
Johannes Berg
maintainerPATCH 3/5 cfg80211: require add_virtual_intf to return new dev
In reply to Johannes BergFrom: Johannes Berg <[email protected]>
cfg80211 used to do all its bookkeeping in the notifier, but some new stuff will have to use local variables so make the callback return the netdev pointer.
--- include/net/cfg80211.h | 11 +++++++---- net/mac80211/cfg.c | 20 ++++++++++++-------- net/wireless/nl80211.c | 7 +++++-- 3 files changed, 24 insertions(+), 14 deletions(-)
include/net/cfg80211.h +7 -4
@@ -1033,7 +1033,8 @@ struct cfg80211_pmksa {* * @add_virtual_intf: create a new virtual interface with the given name, * must set the struct wireless_dev's iftype. Beware: You must create -* the new netdev in the wiphy's network namespace! +* the new netdev in the wiphy's network namespace! Returns the netdev, +* or an ERR_PTR. * * @del_virtual_intf: remove the virtual interface determined by ifindex. *
@@ -1161,9 +1162,11 @@ struct cfg80211_ops {int (*suspend)(struct wiphy *wiphy);int (*resume)(struct wiphy *wiphy); -int (*add_virtual_intf)(struct wiphy *wiphy,char *name, -enum nl80211_iftype type,u32 *flags, -struct vif_params *params); +struct net_device * (*add_virtual_intf)(struct wiphy *wiphy, +char *name, +enum nl80211_iftype type, +u32 *flags, +struct vif_params *params);int (*del_virtual_intf)(struct wiphy *wiphy,struct net_device *dev); int (*change_virtual_intf)(struct wiphy *wiphy, struct net_device *dev,
net/mac80211/cfg.c +12 -8
@@ -19,9 +19,10 @@#include "rate.h" #include "mesh.h" -static int ieee80211_add_iface (struct wiphy *wiphy,char *name, -enum nl80211_iftype type,u32 *flags, -struct vif_params *params) +static struct net_device *ieee80211_add_iface (struct wiphy *wiphy,char *name, +enum nl80211_iftype type, +u32 *flags, +struct vif_params *params) {struct ieee80211_local *local =wiphy_priv (wiphy);struct net_device *dev;
@@ -29,12 +30,15 @@ static int ieee80211_add_iface(struct wiint err; err =ieee80211_if_add (local, name, &dev, type, params); -if (err || type !=NL80211_IFTYPE_MONITOR || !flags) -return err; +if (err) +return ERR_PTR (err); - sdata =IEEE80211_DEV_TO_SUB_IF (dev); - sdata->u.mntr_flags = *flags; -return 0 ; +if (type ==NL80211_IFTYPE_MONITOR && flags) { + sdata =IEEE80211_DEV_TO_SUB_IF (dev); + sdata->u.mntr_flags = *flags; + } + +return dev; }static int ieee80211_del_iface (struct wiphy *wiphy,struct net_device *dev)
net/wireless/nl80211.c +5 -2
@@ -1368,6 +1368,7 @@ static int nl80211_new_interface(struct {struct cfg80211_registered_device *rdev = info->user_ptr[0 ];struct vif_params params; +struct net_device *dev;int err;enum nl80211_iftype type =NL80211_IFTYPE_UNSPECIFIED ;u32 flags;
@@ -1403,11 +1404,13 @@ static int nl80211_new_interface(struct err =parse_monitor_flags (type ==NL80211_IFTYPE_MONITOR ? info->attrs[NL80211_ATTR_MNTR_FLAGS ] :NULL , &flags); - err = rdev->ops->add_virtual_intf (&rdev->wiphy, + dev = rdev->ops->add_virtual_intf (&rdev->wiphy,nla_data (info->attrs[NL80211_ATTR_IFNAME ]), type, err ?NULL : &flags, ¶ms); +if (IS_ERR (dev)) +return PTR_ERR (dev); -return err; +return 0 ; }static int nl80211_del_interface (struct sk_buff *skb,struct genl_info *info)
Johannes Berg
maintainerPATCH 4/5 nl80211: refactor mesh parameter parsing
In reply to Johannes BergFrom: Johannes Berg <[email protected]>
I'm going to need this in a new place later.
---
v2: - reduce scope of macro
net/wireless/nl80211.c | 61 ++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 23 deletions(-)
net/wireless/nl80211.c +38 -23
@@ -2613,14 +2613,6 @@ static int nl80211_get_mesh_params(strucreturn -ENOBUFS ; } -#define FILL_IN_MESH_PARAM_IF_SET (table, cfg, param, mask, attr_num, nla_fn) \ -do {\ - if (table[attr_num]) {\ - cfg.param = nla_fn(table[attr_num]); \ - mask |= (1 << (attr_num - 1)); \ - } \ -} while (0);\ -static const struct nla_policy nl80211_meshconf_params_policy[NL80211_MESHCONF_ATTR_MAX +1 ] = { [NL80211_MESHCONF_RETRY_TIMEOUT ] = { .type =NLA_U16 }, [NL80211_MESHCONF_CONFIRM_TIMEOUT ] = { .type =NLA_U16 },
@@ -2639,31 +2631,34 @@ static const struct nla_policy nl80211_m [NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME] = { .type = NLA_U16 }, }; -static int nl80211_set_mesh_params (struct sk_buff *skb,struct genl_info *info) +static int nl80211_parse_mesh_params (struct genl_info *info, +struct mesh_config *cfg, +u32 *mask_out) { -u32 mask; -struct cfg80211_registered_device *rdev = info->user_ptr[0 ]; -struct net_device *dev = info->user_ptr[1 ]; -struct mesh_config cfg;struct nlattr *tb[NL80211_MESHCONF_ATTR_MAX +1 ]; -struct nlattr *parent_attr; +u32 mask =0 ; + +#define FILL_IN_MESH_PARAM_IF_SET (table, cfg, param, mask, attr_num, nla_fn) \ +do {\ + if (table[attr_num]) {\ + cfg->param = nla_fn(table[attr_num]); \ + mask |= (1 << (attr_num - 1)); \ + } \ +} while (0);\ + - parent_attr = info->attrs[NL80211_ATTR_MESH_PARAMS ]; -if (!parent_attr) +if (!info->attrs[NL80211_ATTR_MESH_PARAMS ])return -EINVAL ;if (nla_parse_nested (tb,NL80211_MESHCONF_ATTR_MAX , - parent_attr, nl80211_meshconf_params_policy)) + info->attrs[NL80211_ATTR_MESH_PARAMS ], + nl80211_meshconf_params_policy))return -EINVAL ; -if (!rdev->ops->set_mesh_params) -return -EOPNOTSUPP ; -/* This makes sure that there aren't more than 32 mesh config * parameters (otherwise our bitfield scheme would not work.) */ BUILD_BUG_ON (NL80211_MESHCONF_ATTR_MAX >32 );/* Fill in the params struct */ - mask =0 ;FILL_IN_MESH_PARAM_IF_SET (tb, cfg, dot11MeshRetryTimeout, mask,NL80211_MESHCONF_RETRY_TIMEOUT , nla_get_u16); FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshConfirmTimeout,
@@ -2703,12 +2698,32 @@ static int nl80211_set_mesh_params(strucNL80211_MESHCONF_HWMP_ROOTMODE , nla_get_u8); +if (mask_out) + *mask_out = mask; +return 0 ; + +#undef FILL_IN_MESH_PARAM_IF_SET +} + +static int nl80211_set_mesh_params (struct sk_buff *skb,struct genl_info *info) +{ +struct cfg80211_registered_device *rdev = info->user_ptr[0 ]; +struct net_device *dev = info->user_ptr[1 ]; +struct mesh_config cfg; +u32 mask; +int err; + +if (!rdev->ops->set_mesh_params) +return -EOPNOTSUPP ; + + err =nl80211_parse_mesh_params (info, &cfg, &mask); +if (err) +return err; +/* Apply changes */ return rdev->ops->set_mesh_params (&rdev->wiphy, dev, &cfg, mask); } -#undef FILL_IN_MESH_PARAM_IF_SET -static int nl80211_get_reg (struct sk_buff *skb,struct genl_info *info) {struct sk_buff *msg;
Johannes Berg
maintainerPATCH 5/5 cfg80211/mac80211: add mesh join/leave commands
In reply to Johannes BergFrom: Johannes Berg <[email protected]>
Instead of tying mesh activity to interface up, add join and leave commands for mesh. Since we must be backward compatible, let cfg80211 handle joining a mesh if a mesh ID was pre-configured when the device goes up.
Note that this therefore must modify mac80211 as well since mac80211 needs to lose the logic to start the mesh on interface up.
We now allow querying mesh parameters before the mesh is connected, which simply returns defaults. Setting them (internally renamed to "update") is only allowed while connected. Specify them with the new mesh join command instead where needed.
In mac80211, beaconing must now also follow the mesh enabled/not enabled state, which is done by testing the mesh ID.
---
v2: - fix join on netdev up (pointed out by Javier)
- only require mesh ID (pointed out by Javier)
- more sanity checking around get/set_mesh_params
- rename set_mesh_params to update_mesh_params, disallow calling it before connected to mesh
- add some mesh interface type checks
- introduce mesh_setup struct for static config
v3: - fold in Javier's beaconing patch
include/linux/nl80211.h | 8 ++ include/net/cfg80211.h | 38 +++++++++--- net/mac80211/cfg.c | 39 +++++++++--- net/mac80211/ieee80211_i.h | 13 ---- net/mac80211/iface.c | 14 ---- net/mac80211/main.c | 3 net/mac80211/mesh.c | 26 +------- net/mac80211/mesh.h | 25 -------- net/wireless/Makefile | 2 net/wireless/core.c | 15 ++++ net/wireless/core.h | 13 ++++ net/wireless/mesh.c | 140 +++++++++++++++++++++++++++++++++++++++++++++ net/wireless/nl80211.c | 137 +++++++++++++++++++++++++++++++++++++------- net/wireless/util.c | 1 14 files changed, 359 insertions(+), 115 deletions(-)
include/linux/nl80211.h +8 -0
@@ -394,6 +394,11 @@* * @NL80211_CMD_SET_WDS_PEER: Set the MAC address of the peer on a WDS interface. * +* @NL80211_CMD_JOIN_MESH: Join a mesh. The mesh ID must be given, and initial +* mesh config parameters may be given. +* @NL80211_CMD_LEAVE_MESH: Leave the mesh network -- no special arguments, the +* network is determined by the network interface. +* * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use */
@@ -500,6 +505,9 @@ enum nl80211_commands {NL80211_CMD_FRAME_WAIT_CANCEL , +NL80211_CMD_JOIN_MESH , + NL80211_CMD_LEAVE_MESH, +/* add new commands above here */ /* used to define NL80211_CMD_MAX below */
include/net/cfg80211.h +29 -9
@@ -258,13 +258,9 @@ struct ieee80211_supported_band {/** * struct vif_params - describes virtual interface parameters -* @mesh_id: mesh ID to use -* @mesh_id_len: length of the mesh ID * @use_4addr: use 4-address frames */ struct vif_params { -u8 *mesh_id; -int mesh_id_len;int use_4addr; };
@@ -615,6 +611,11 @@ struct bss_parameters {int ap_isolate; }; +/* +* struct mesh_config - 802.11s mesh configuration +* +* These parameters can be changed while the mesh is active. +*/ struct mesh_config {/* Timeouts in ms */ /* Mesh plink management parameters */
@@ -638,6 +639,18 @@ struct mesh_config { };/** +* struct mesh_setup - 802.11s mesh setup configuration +* @mesh_id: the mesh ID +* @mesh_id_len: length of the mesh ID, at least 1 and at most 32 bytes +* +* These parameters are fixed when the mesh is created. +*/ +struct mesh_setup { +const u8 *mesh_id; +u8 mesh_id_len; +}; + +/** * struct ieee80211_txq_params - TX queue parameters * @queue: TX queue identifier (NL80211_TXQ_Q_*) * @txop: Maximum burst time in units of 32 usecs, 0 meaning disabled
@@ -1078,7 +1091,7 @@ struct cfg80211_pmksa {* * @get_mesh_params: Put the current mesh parameters into *params * -* @set_mesh_params: Set mesh parameters. +* @update_mesh_params: Update mesh parameters on a running mesh. * The mask is a bitfield which tells us which parameters to * set, and which to leave alone. *
@@ -1222,9 +1235,14 @@ struct cfg80211_ops {int (*get_mesh_params)(struct wiphy *wiphy,struct net_device *dev,struct mesh_config *conf); -int (*set_mesh_params)(struct wiphy *wiphy, -struct net_device *dev, -const struct mesh_config *nconf,u32 mask); +int (*update_mesh_params)(struct wiphy *wiphy, +struct net_device *dev,u32 mask, +const struct mesh_config *nconf); +int (*join_mesh)(struct wiphy *wiphy,struct net_device *dev, +const struct mesh_config *conf, +const struct mesh_setup *setup); +int (*leave_mesh)(struct wiphy *wiphy,struct net_device *dev); +int (*change_bss)(struct wiphy *wiphy,struct net_device *dev,struct bss_parameters *params);
@@ -1640,6 +1658,8 @@ struct cfg80211_cached_keys;* @bssid: (private) Used by the internal configuration code * @ssid: (private) Used by the internal configuration code * @ssid_len: (private) Used by the internal configuration code +* @mesh_id_len: (private) Used by the internal configuration code +* @mesh_id_up_len: (private) Used by the internal configuration code * @wext: (private) Used by the internal wireless extensions compat code * @use_4addr: indicates 4addr mode is used on this interface, must be * set by driver (if supported) on add_interface BEFORE registering the
@@ -1669,7 +1689,7 @@ struct wireless_dev {/* currently used for IBSS and SME - might be rearranged later */ u8 ssid[IEEE80211_MAX_SSID_LEN ]; -u8 ssid_len; +u8 ssid_len, mesh_id_len, mesh_id_up_len;enum {CFG80211_SME_IDLE ,CFG80211_SME_CONNECTING ,
net/wireless/Makefile +1 -1
@@ -10,7 +10,7 @@ obj-$(CONFIG_WEXT_SPY) += wext-spy.o obj-$(CONFIG_WEXT_PRIV) += wext-priv.o cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o -cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o +cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o cfg80211-$(CONFIG_CFG80211_INTERNAL_REGDB) += regdb.o
net/wireless/core.h +13 -0
@@ -285,6 +285,19 @@ void __cfg80211_ibss_joined(struct net_dint cfg80211_ibss_wext_join (struct cfg80211_registered_device *rdev,struct wireless_dev *wdev); +/* mesh */ +extern const struct mesh_config default_mesh_config; +int __cfg80211_join_mesh (struct cfg80211_registered_device *rdev, +struct net_device *dev, +const u8 *mesh_id,u8 mesh_id_len, +const struct mesh_config *conf); +int cfg80211_join_mesh (struct cfg80211_registered_device *rdev, +struct net_device *dev, +const u8 *mesh_id,u8 mesh_id_len, +const struct mesh_config *conf); +int cfg80211_leave_mesh (struct cfg80211_registered_device *rdev, +struct net_device *dev); +/* MLME */ int __cfg80211_mlme_auth(struct cfg80211_registered_device *rdev, struct net_device *dev,
net/wireless/mesh.c new file +140 -0
140 lines not on this page · raw message
net/wireless/nl80211.c +116 -21
224 lines not on this page · raw message
net/wireless/core.c +13 -2
@@ -332,6 +332,7 @@ struct wiphy *wiphy_new(const struct cfgWARN_ON (ops->add_virtual_intf && !ops->del_virtual_intf);WARN_ON (ops->add_station && !ops->del_station);WARN_ON (ops->add_mpath && !ops->del_mpath); +WARN_ON (ops->join_mesh && !ops->leave_mesh); alloc_size =sizeof (*rdev) + sizeof_priv;
@@ -752,6 +753,9 @@ static int cfg80211_netdev_notifier_callcfg80211_mlme_down (rdev, dev);wdev_unlock (wdev);break ; +case NL80211_IFTYPE_MESH_POINT : +cfg80211_leave_mesh (rdev, dev); +break ;default :break ; }
@@ -775,20 +779,27 @@ static int cfg80211_netdev_notifier_call }cfg80211_lock_rdev (rdev);mutex_lock (&rdev->devlist_mtx); -#ifdef CONFIG_CFG80211_WEXT wdev_lock (wdev);switch (wdev->iftype) { +#ifdef CONFIG_CFG80211_WEXT case NL80211_IFTYPE_ADHOC :cfg80211_ibss_wext_join (rdev, wdev);break ;case NL80211_IFTYPE_STATION :cfg80211_mgd_wext_connect (rdev, wdev);break ; +#endif +case NL80211_IFTYPE_MESH_POINT : +/* backward compat code ... */ +if (wdev->mesh_id_up_len) +__cfg80211_join_mesh (rdev, dev, wdev->ssid, + wdev->mesh_id_up_len, + &default_mesh_config); +break ;default :break ; }wdev_unlock (wdev); -#endif rdev->opencount++;mutex_unlock (&rdev->devlist_mtx);cfg80211_unlock_rdev (rdev);
net/mac80211/cfg.c +30 -9
@@ -60,11 +60,6 @@ static int ieee80211_change_iface(structif (ret)return ret; -if (ieee80211_vif_is_mesh (&sdata->vif) && params->mesh_id_len) -ieee80211_sdata_set_mesh_id (sdata, - params->mesh_id_len, - params->mesh_id); -if (type ==NL80211_IFTYPE_AP_VLAN && params && params->use_4addr ==0 )rcu_assign_pointer (sdata->u.vlan.sta,NULL );
@@ -1003,9 +998,9 @@ static inline bool _chg_mesh_attr(enum nreturn (mask >> (parm-1 )) &0x1 ; } -static int ieee80211_set_mesh_params (struct wiphy *wiphy, -struct net_device *dev, -const struct mesh_config *nconf,u32 mask) +static int ieee80211_update_mesh_params (struct wiphy *wiphy, +struct net_device *dev,u32 mask, +const struct mesh_config *nconf) {struct mesh_config *conf;struct ieee80211_sub_if_data *sdata;
@@ -1056,6 +1051,30 @@ static int ieee80211_set_mesh_params(strreturn 0 ; } +static int ieee80211_join_mesh (struct wiphy *wiphy,struct net_device *dev, +const struct mesh_config *conf, +const struct mesh_setup *setup) +{ +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); +struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; + +memcpy (&sdata->u.mesh.mshcfg, conf,sizeof (struct mesh_config )); + ifmsh->mesh_id_len = setup->mesh_id_len; +memcpy (ifmsh->mesh_id, setup->mesh_id, ifmsh->mesh_id_len); + +ieee80211_start_mesh (sdata); + +return 0 ; +} + +static int ieee80211_leave_mesh (struct wiphy *wiphy,struct net_device *dev) +{ +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); + +ieee80211_stop_mesh (sdata); + +return 0 ; +}#endif static int ieee80211_change_bss(struct wiphy *wiphy,
@@ -1760,8 +1779,10 @@ 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, + .update_mesh_params = ieee80211_update_mesh_params, .get_mesh_params = ieee80211_get_mesh_params, + .join_mesh = ieee80211_join_mesh, + .leave_mesh = ieee80211_leave_mesh, #endif .change_bss = ieee80211_change_bss, .set_txq_params = ieee80211_set_txq_params,
net/mac80211/ieee80211_i.h +0 -13
@@ -608,19 +608,6 @@ struct ieee80211_sub_if_data *vif_to_sda return container_of(p, struct ieee80211_sub_if_data, vif); } -static inline void -ieee80211_sdata_set_mesh_id (struct ieee80211_sub_if_data *sdata, -u8 mesh_id_len,u8 *mesh_id) -{ -#ifdef CONFIG_MAC80211_MESH -struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; - ifmsh->mesh_id_len = mesh_id_len; -memcpy (ifmsh->mesh_id, mesh_id, mesh_id_len); -#else -WARN_ON (1 ); -#endif -} -enum sdata_queue_type {IEEE80211_SDATA_QUEUE_TYPE_FRAME =0 ,IEEE80211_SDATA_QUEUE_AGG_START =1 ,
net/mac80211/iface.c +1 -13
@@ -268,9 +268,7 @@ static int ieee80211_do_open(struct net_ goto err_stop; } -if (ieee80211_vif_is_mesh (&sdata->vif)) { -ieee80211_start_mesh (sdata); - }else if (sdata->vif.type ==NL80211_IFTYPE_AP ) { +if (sdata->vif.type ==NL80211_IFTYPE_AP ) { local->fif_pspoll++; local->fif_probe_req++;
@@ -495,10 +493,6 @@ static void ieee80211_do_stop(struct ieeieee80211_adjust_monitor_flags (sdata,-1 );ieee80211_configure_filter (local);break ; -case NL80211_IFTYPE_MESH_POINT : -if (ieee80211_vif_is_mesh (&sdata->vif)) -ieee80211_stop_mesh (sdata); -/* fall through */ default :flush_work (&sdata->work);/*
@@ -1188,12 +1182,6 @@ int ieee80211_if_add(struct ieee80211_loif (ret) goto fail; -if (ieee80211_vif_is_mesh (&sdata->vif) && - params && params->mesh_id_len) -ieee80211_sdata_set_mesh_id (sdata, - params->mesh_id_len, - params->mesh_id); -mutex_lock (&local->iflist_mtx);list_add_tail_rcu (&sdata->list, &local->interfaces);mutex_unlock (&local->iflist_mtx);
net/mac80211/mesh.c +5 -21
@@ -530,6 +530,11 @@ void ieee80211_start_mesh(struct ieee802void ieee80211_stop_mesh (struct ieee80211_sub_if_data *sdata) {struct ieee80211_local *local = sdata->local; +struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; + + ifmsh->mesh_id_len =0 ; +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BEACON_ENABLED ); +sta_info_flush (local,NULL );del_timer_sync (&sdata->u.mesh.housekeeping_timer);del_timer_sync (&sdata->u.mesh.mesh_path_root_timer);
@@ -674,27 +679,6 @@ void ieee80211_mesh_init_sdata(struct ie ieee80211_mesh_housekeeping_timer, (unsigned long) sdata); - ifmsh->mshcfg.dot11MeshRetryTimeout =MESH_RET_T ; - ifmsh->mshcfg.dot11MeshConfirmTimeout =MESH_CONF_T ; - ifmsh->mshcfg.dot11MeshHoldingTimeout =MESH_HOLD_T ; - ifmsh->mshcfg.dot11MeshMaxRetries =MESH_MAX_RETR ; - ifmsh->mshcfg.dot11MeshTTL =MESH_TTL ; - ifmsh->mshcfg.element_ttl =MESH_DEFAULT_ELEMENT_TTL ; - ifmsh->mshcfg.auto_open_plinks = true; - ifmsh->mshcfg.dot11MeshMaxPeerLinks = -MESH_MAX_ESTAB_PLINKS ; - ifmsh->mshcfg.dot11MeshHWMPactivePathTimeout = -MESH_PATH_TIMEOUT ; - ifmsh->mshcfg.dot11MeshHWMPpreqMinInterval = -MESH_PREQ_MIN_INT ; - ifmsh->mshcfg.dot11MeshHWMPnetDiameterTraversalTime = -MESH_DIAM_TRAVERSAL_TIME ; - ifmsh->mshcfg.dot11MeshHWMPmaxPREQretries = -MESH_MAX_PREQ_RETRIES ; - ifmsh->mshcfg.path_refresh_time = -MESH_PATH_REFRESH_TIME ; - ifmsh->mshcfg.min_discovery_timeout = -MESH_MIN_DISCOVERY_TIMEOUT ; ifmsh->accepting_plinks = true; ifmsh->preq_id =0 ; ifmsh->sn =0 ;
net/mac80211/mesh.h +0 -25
@@ -175,33 +175,10 @@ struct mesh_rmc {*/ #define MESH_CFG_CMP_LEN (IEEE80211_MESH_CONFIG_LEN - 2) -/* Default values, timeouts in ms */ -#define MESH_TTL 31 -#define MESH_MAX_RETR 3 -#define MESH_RET_T 100 -#define MESH_CONF_T 100 -#define MESH_HOLD_T 100 - -#define MESH_PATH_TIMEOUT 5000 -/* Minimum interval between two consecutive PREQs originated by the same -* interface -*/ -#define MESH_PREQ_MIN_INT 10 -#define MESH_DIAM_TRAVERSAL_TIME 50 -/* A path will be refreshed if it is used PATH_REFRESH_TIME milliseconds before -* timing out. This way it will remain ACTIVE and no data frames will be -* unnecesarily held in the pending queue. -*/ -#define MESH_PATH_REFRESH_TIME 1000 -#define MESH_MIN_DISCOVERY_TIMEOUT (2 * MESH_DIAM_TRAVERSAL_TIME)#define MESH_DEFAULT_BEACON_INTERVAL 1000/* in 1024 us units */ -#define MESH_MAX_PREQ_RETRIES 4#define MESH_PATH_EXPIRE (600 * HZ) -/* Default maximum number of established plinks per interface */ -#define MESH_MAX_ESTAB_PLINKS 32 -/* Default maximum number of plinks per interface */ #define MESH_MAX_PLINKS 256
@@ -216,8 +193,6 @@ struct mesh_rmc {#define PERR_RCODE_NO_ROUTE 12#define PERR_RCODE_DEST_UNREACH 13 -#define MESH_DEFAULT_ELEMENT_TTL 31 -/* Public interfaces */ /* Various */ int ieee80211_fill_mesh_addresses(struct ieee80211_hdr *hdr, __le16 *fc,
net/wireless/util.c +1 -0
@@ -792,6 +792,7 @@ int cfg80211_change_iface(struct cfg8021if (ntype != otype) { dev->ieee80211_ptr->use_4addr = false; + dev->ieee80211_ptr->mesh_id_up_len =0 ;switch (otype) {case NL80211_IFTYPE_ADHOC :
net/mac80211/main.c +2 -1
@@ -246,7 +246,8 @@ void ieee80211_bss_info_change_notify(st !!sdata->u.ibss.presp;break ;case NL80211_IFTYPE_MESH_POINT : - sdata->vif.bss_conf.enable_beacon = true; + sdata->vif.bss_conf.enable_beacon = + !!sdata->u.mesh.mesh_id_len;break ;default :/* not reached */