diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-12-03 09:20:44 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-06 16:01:29 -0500 |
| commit | 29cbe68c516a48a9a88b3226878570c6cbd83c02 (patch) | |
| tree | 4774f8a3a244236234a521baa4d1ae5b3e1494ba /net/wireless/util.c | |
| parent | bd90fdcc5fbd99a2a778999610420cf793bd1be2 (diff) | |
| download | linux-3.10-29cbe68c516a48a9a88b3226878570c6cbd83c02.tar.gz linux-3.10-29cbe68c516a48a9a88b3226878570c6cbd83c02.tar.bz2 linux-3.10-29cbe68c516a48a9a88b3226878570c6cbd83c02.zip | |
cfg80211/mac80211: add mesh join/leave commands
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.
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/util.c')
| -rw-r--r-- | net/wireless/util.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index fee020b15a4..4de624ca4c6 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -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: |