Commit 176f3608 authored by Thomas Pedersen's avatar Thomas Pedersen Committed by John W. Linville
Browse files

mac80211: add HT IEs to mesh frames 



Signed-off-by: default avatarThomas Pedersen <thomas@cozybit.com>
Signed-off-by: default avatarAshok Nagarajan <anagar6@uic.edu>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 42e7aa77

net/mac80211/mesh.c

+43 −0
Original line number Diff line number Diff line
@@ -341,6 +341,49 @@ int mesh_add_ds_params_ie(struct sk_buff *skb, 
	return 0;

}



int mesh_add_ht_cap_ie(struct sk_buff *skb,

		       struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_supported_band *sband;

	u8 *pos;



	sband = local->hw.wiphy->bands[local->oper_channel->band];

	if (!sband->ht_cap.ht_supported ||

	    local->_oper_channel_type == NL80211_CHAN_NO_HT)

		return 0;



	if (skb_tailroom(skb) < 2 + sizeof(struct ieee80211_ht_cap))

		return -ENOMEM;



	pos = skb_put(skb, 2 + sizeof(struct ieee80211_ht_cap));

	ieee80211_ie_build_ht_cap(pos, sband, sband->ht_cap.cap);



	return 0;

}



int mesh_add_ht_info_ie(struct sk_buff *skb,

			struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_channel *channel = local->oper_channel;

	enum nl80211_channel_type channel_type = local->_oper_channel_type;

	struct ieee80211_supported_band *sband =

				local->hw.wiphy->bands[channel->band];

	struct ieee80211_sta_ht_cap *ht_cap = &sband->ht_cap;

	u8 *pos;



	if (!ht_cap->ht_supported || channel_type == NL80211_CHAN_NO_HT)

		return 0;



	if (skb_tailroom(skb) < 2 + sizeof(struct ieee80211_ht_info))

		return -ENOMEM;



	pos = skb_put(skb, 2 + sizeof(struct ieee80211_ht_info));

	ieee80211_ie_build_ht_info(pos, ht_cap, channel, channel_type);



	return 0;

}

static void ieee80211_mesh_path_timer(unsigned long data)

{

	struct ieee80211_sub_if_data *sdata =

net/mac80211/mesh.h

+4 −0
Original line number Diff line number Diff line
@@ -212,6 +212,10 @@ int mesh_add_vendor_ies(struct sk_buff *skb, 
			struct ieee80211_sub_if_data *sdata);

int mesh_add_ds_params_ie(struct sk_buff *skb,

			  struct ieee80211_sub_if_data *sdata);

int mesh_add_ht_cap_ie(struct sk_buff *skb,

		       struct ieee80211_sub_if_data *sdata);

int mesh_add_ht_info_ie(struct sk_buff *skb,

			struct ieee80211_sub_if_data *sdata);

void mesh_rmc_free(struct ieee80211_sub_if_data *sdata);

int mesh_rmc_init(struct ieee80211_sub_if_data *sdata);

void ieee80211s_init(void);

net/mac80211/mesh_plink.c

+9 −0
Original line number Diff line number Diff line
@@ -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;

net/mac80211/tx.c

+4 −0
Original line number Diff line number Diff line
@@ -2292,6 +2292,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, 
				    2 + 8 + /* supported rates */

				    2 + 3 + /* DS params */

				    2 + (IEEE80211_MAX_SUPP_RATES - 8) +

				    2 + sizeof(struct ieee80211_ht_cap) +

				    2 + sizeof(struct ieee80211_ht_info) +

				    2 + sdata->u.mesh.mesh_id_len +

				    2 + sizeof(struct ieee80211_meshconf_ie) +

				    sdata->u.mesh.ie_len);
@@ -2319,6 +2321,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, 
		    mesh_add_ds_params_ie(skb, sdata) ||

		    ieee80211_add_ext_srates_ie(&sdata->vif, skb) ||

		    mesh_add_rsn_ie(skb, sdata) ||

		    mesh_add_ht_cap_ie(skb, sdata) ||

		    mesh_add_ht_info_ie(skb, sdata) ||

		    mesh_add_meshid_ie(skb, sdata) ||

		    mesh_add_meshconf_ie(skb, sdata) ||

		    mesh_add_vendor_ies(skb, sdata)) {