aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorThomas Pedersen <thomas@cozybit.com>2011-10-26 17:47:27 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-11-08 15:54:33 -0500
commit176f36086e8a00bdf701dc6e4c5a8784ef6529df (patch)
tree808f70cf8db3eff72f66941516a3d39594ad6992 /net/mac80211/tx.c
parent42e7aa771196d8129d9deaee950b3177a443b8cf (diff)
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/tx.c')
-rw-r--r--net/mac80211/tx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index f4dd339e7cdd..a543d26058db 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2292,6 +2292,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
2292 2 + 8 + /* supported rates */ 2292 2 + 8 + /* supported rates */
2293 2 + 3 + /* DS params */ 2293 2 + 3 + /* DS params */
2294 2 + (IEEE80211_MAX_SUPP_RATES - 8) + 2294 2 + (IEEE80211_MAX_SUPP_RATES - 8) +
2295 2 + sizeof(struct ieee80211_ht_cap) +
2296 2 + sizeof(struct ieee80211_ht_info) +
2295 2 + sdata->u.mesh.mesh_id_len + 2297 2 + sdata->u.mesh.mesh_id_len +
2296 2 + sizeof(struct ieee80211_meshconf_ie) + 2298 2 + sizeof(struct ieee80211_meshconf_ie) +
2297 sdata->u.mesh.ie_len); 2299 sdata->u.mesh.ie_len);
@@ -2319,6 +2321,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
2319 mesh_add_ds_params_ie(skb, sdata) || 2321 mesh_add_ds_params_ie(skb, sdata) ||
2320 ieee80211_add_ext_srates_ie(&sdata->vif, skb) || 2322 ieee80211_add_ext_srates_ie(&sdata->vif, skb) ||
2321 mesh_add_rsn_ie(skb, sdata) || 2323 mesh_add_rsn_ie(skb, sdata) ||
2324 mesh_add_ht_cap_ie(skb, sdata) ||
2325 mesh_add_ht_info_ie(skb, sdata) ||
2322 mesh_add_meshid_ie(skb, sdata) || 2326 mesh_add_meshid_ie(skb, sdata) ||
2323 mesh_add_meshconf_ie(skb, sdata) || 2327 mesh_add_meshconf_ie(skb, sdata) ||
2324 mesh_add_vendor_ies(skb, sdata)) { 2328 mesh_add_vendor_ies(skb, sdata)) {