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>
This commit is contained in:

committed by
John W. Linville

parent
42e7aa7711
commit
176f36086e
@@ -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 =
|
||||
|
Reference in New Issue
Block a user