cfg80211/mac80211: add mesh join/leave commands
Subsystems (2)
PATCH v4 1/1 cfg80211/mac80211: add mesh join/leave commands
From: 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
v4: - wrap mesh sections inside CONFIG_MAC80211_MESH to
fix compilation problems reported by Stephen Rothwell, Larry Finger and Bruno Randolf.
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 | 5 +- 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, 361 insertions(+), 115 deletions(-) create mode 100644 net/wireless/mesh.c
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. *
@@ -1229,9 +1242,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);
@@ -1647,6 +1665,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
@@ -1676,7 +1696,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/mac80211/cfg.c +30 -9
@@ -60,11 +60,6 @@ static int ieee80211_change_iface(struct wiphy *wiphy,if (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 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) +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(struct wiphy *wiphy,return 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_sdata(struct ieee80211_vif *p) 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_device *dev, bool coming_up) 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 ieee80211_sub_if_data *sdata,ieee80211_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_local *local, const char *name,if (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/main.c +4 -1
@@ -245,9 +245,12 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, sdata->vif.bss_conf.enable_beacon = !!sdata->u.ibss.presp;break ; +#ifdef CONFIG_MAC80211_MESH 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 ; +#endif default :/* not reached */ WARN_ON (1 );
net/mac80211/mesh.c +5 -21
@@ -530,6 +530,11 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)void 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 ieee80211_sub_if_data *sdata) 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/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.c +13 -2
@@ -332,6 +332,7 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv)WARN_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_call(struct notifier_block * nb,cfg80211_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(struct notifier_block * nb, }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/wireless/core.h +13 -0
@@ -285,6 +285,19 @@ void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid);int 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/util.c +1 -0
@@ -792,6 +792,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,if (ntype != otype) { dev->ieee80211_ptr->use_4addr = false; + dev->ieee80211_ptr->mesh_id_up_len =0 ;switch (otype) {case NL80211_IFTYPE_ADHOC :
Signature · 1 line
1.7.1
Johannes Berg
maintainerQuoted 3 lines · Javier Cardona
v4: - wrap mesh sections inside
CONFIG_MAC80211_MESHto
fix compilation problems reported by Stephen Rothwell, Larry Finger and Bruno Randolf.
Thanks, but since it was already applied we probably need a follow-on fixup patch?
johannes
Johannes,
Quoted 8 lines · Johannes Berg
Quoted 3 lines · Javier Cardona
v4: - wrap mesh sections inside
CONFIG_MAC80211_MESHto fix compilation problems reported by Stephen Rothwell, Larry Finger and Bruno Randolf.Thanks, but since it was already applied we probably need a follow-on fixup patch?
Stephen did not apply it so I wasn't sure if John was going to revert it as well.
I'll send a fixup patch and let them choose.
Cheers,
Javier
Signature · 3 lines
Javier Cardona cozybit Inc. http://www.cozybit.com
PATCH 1/1 cfg80211/mac80211: fix-up mesh join/leave build breakage
In reply to Johannes BergFrom: Javier Cardona <[email protected]>
Fix-up build breakage from "cfg80211/mac80211: add mesh join/leave commands" (commit 29cbe68c516a48a9a88b3226878570c6cbd83c02).
--- net/mac80211/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
net/mac80211/main.c +2 -0
@@ -245,10 +245,12 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, sdata->vif.bss_conf.enable_beacon = !!sdata->u.ibss.presp;break ; +#ifdef CONFIG_MAC80211_MESH case NL80211_IFTYPE_MESH_POINT : sdata->vif.bss_conf.enable_beacon = !!sdata->u.mesh.mesh_id_len;break ; +#endif default :/* not reached */ WARN_ON (1 );
Signature · 1 line
1.7.3.2
PATCH 1/1 mac80211: Fix compilation error when mesh is disabled
In reply to Johannes BergWrap mesh sections inside CONFIG_MAC80211_MESH to fix compilation problems reported by Stephen Rothwell, Larry Finger and Bruno Randolf.
--- net/mac80211/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
net/mac80211/main.c +2 -0
@@ -245,10 +245,12 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, sdata->vif.bss_conf.enable_beacon = !!sdata->u.ibss.presp;break ; +#ifdef CONFIG_MAC80211_MESH case NL80211_IFTYPE_MESH_POINT : sdata->vif.bss_conf.enable_beacon = !!sdata->u.mesh.mesh_id_len;break ; +#endif default :/* not reached */ WARN_ON (1 );
Signature · 1 line
1.7.1