diff options
| author |   Thomas Pedersen <thomas@cozybit.com> | 2011-10-26 14:47:27 -0700 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2011-11-08 15:54:33 -0500 |
| commit | 176f36086e8a00bdf701dc6e4c5a8784ef6529df (patch) | |
| tree | 808f70cf8db3eff72f66941516a3d39594ad6992 /net/mac80211/mesh_plink.c | |
| parent | mac80211: Add HT helper functions (diff) | |
| download | linux-dev-176f36086e8a00bdf701dc6e4c5a8784ef6529df.tar.xz linux-dev-176f36086e8a00bdf701dc6e4c5a8784ef6529df.zip | |
mac80211: add HT IEs to mesh frames
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Ashok Nagarajan <anagar6@uic.edu>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mesh_plink.c')
| -rw-r--r-- | net/mac80211/mesh_plink.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 351e48c9710c..986af8acc49e 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -169,6 +169,8 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata, 2 + (IEEE80211_MAX_SUPP_RATES - 8) + 2 + sdata->u.mesh.mesh_id_len + 2 + sizeof(struct ieee80211_meshconf_ie) + + 2 + sizeof(struct ieee80211_ht_cap) + + 2 + sizeof(struct ieee80211_ht_info) + 2 + 8 + /* peering IE */ sdata->u.mesh.ie_len); if (!skb) @@ -241,6 +243,13 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata, memcpy(pos, &reason, 2); pos += 2; } + + if (action != WLAN_SP_MESH_PEERING_CLOSE) { + if (mesh_add_ht_cap_ie(skb, sdata) || + mesh_add_ht_info_ie(skb, sdata)) + return -1; + } + if (mesh_add_vendor_ies(skb, sdata)) return -1; |