diff options
| author |   Javier Cardona <javier@cozybit.com> | 2010-12-16 17:37:49 -0800 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-12-20 14:46:57 -0500 |
| commit | c80d545da3f7c0e534ccd4a780f322f80a92cff1 (patch) | |
| tree | edd5c51676b4677fc1a0b2fc692ffe97df863f25 /net/wireless/core.c | |
| parent | mac80211: Rename mesh_params to mesh_config to prepare for mesh_setup (diff) | |
| download | linux-dev-c80d545da3f7c0e534ccd4a780f322f80a92cff1.tar.xz linux-dev-c80d545da3f7c0e534ccd4a780f322f80a92cff1.zip | |
mac80211: Let userspace enable and configure vendor specific path selection.
Userspace will now be allowed to toggle between the default path
selection algorithm (HWMP, implemented in the kernel), and a vendor
specific alternative. Also in the same patch, allow userspace to add
information elements to mesh beacons. This is accordance with the
Extensible Path Selection Framework specified in version 7.0 of the
802.11s draft.
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 79772fcc37bc..e9a5f8ca4c27 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -789,13 +789,23 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, cfg80211_mgd_wext_connect(rdev, wdev); break; #endif +#ifdef CONFIG_MAC80211_MESH 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; + { + /* backward compat code... */ + struct mesh_setup setup; + memcpy(&setup, &default_mesh_setup, + sizeof(setup)); + /* back compat only needed for mesh_id */ + setup.mesh_id = wdev->ssid; + setup.mesh_id_len = wdev->mesh_id_up_len; + if (wdev->mesh_id_up_len) + __cfg80211_join_mesh(rdev, dev, + &setup, + &default_mesh_config); + break; + } +#endif default: break; } |