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/mac80211/mesh.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/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 63e1188d5062..c326e009389d 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -287,6 +287,13 @@ void mesh_mgmt_ies_add(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) *pos++ |= sdata->u.mesh.accepting_plinks ? MESHCONF_CAPAB_ACCEPT_PLINKS : 0x00; *pos++ = 0x00; + + if (sdata->u.mesh.vendor_ie) { + int len = sdata->u.mesh.vendor_ie_len; + const u8 *data = sdata->u.mesh.vendor_ie; + if (skb_tailroom(skb) > len) + memcpy(skb_put(skb, len), data, len); + } } u32 mesh_table_hash(u8 *addr, struct ieee80211_sub_if_data *sdata, struct mesh_table *tbl) |