diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-05-16 21:50:20 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-05 19:32:18 (GMT) |
| commit | cc1d2806bf06ab92268343d26eb3d8d8f00f8bc9 (patch) | |
| tree | b14ffa920d616470715e715df49f990bfdcf12ae /net/mac80211 | |
| parent | 685d12a1929f274bd91497e33b4255fe164ac8ec (diff) | |
| download | linux-fsl-qoriq-cc1d2806bf06ab92268343d26eb3d8d8f00f8bc9.tar.xz | |
cfg80211: provide channel to join_mesh function
Just like the AP mode patch, instead of setting
the channel and then joining the mesh network,
provide the channel to join the network on to
the join_mesh() function.
Like in AP mode, you can also give the channel
to the join-mesh nl80211 command now.
Unlike AP mode, it picks a default channel if
none was given.
As libertas uses mesh mode interfaces but has
no join_mesh callback and we can't simply break
it, keep some compatibility code for that case
and configure the channel directly for it.
In the non-libertas case, where we store the
channel until join, allow setting it while the
interface is down.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/cfg.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 8e9d525..f47af8b 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1598,6 +1598,12 @@ static int ieee80211_join_mesh(struct wiphy *wiphy, struct net_device *dev, err = copy_mesh_setup(ifmsh, setup); if (err) return err; + + err = ieee80211_set_channel(wiphy, dev, setup->channel, + setup->channel_type); + if (err) + return err; + ieee80211_start_mesh(sdata); return 0; |