diff options
author | Mahesh Palivela <maheshp@posedge.com> | 2012-10-10 07:25:40 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-10-17 05:02:13 -0400 |
commit | d4950281d72d8845225e3a39dbeb366c40c824c9 (patch) | |
tree | 57396a72a205ed8d3b30993f6be44c7766b9722c /net/mac80211/mlme.c | |
parent | 1258d97616fdca9abc0c21f2edeb1d5b21dcb128 (diff) |
ieee80211: Rename VHT cap struct
Rename struct ieee80211_vht_capabilities to ieee80211_vht_cap
and renamed its member vht_capabilities_info to vht_cap_info.
Signed-off-by: Mahesh Palivela <maheshp@posedge.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index f24884a60614..4af5a3eb892e 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -353,7 +353,7 @@ static void ieee80211_add_vht_ie(struct ieee80211_sub_if_data *sdata, | |||
353 | cap = vht_cap.cap; | 353 | cap = vht_cap.cap; |
354 | 354 | ||
355 | /* reserve and fill IE */ | 355 | /* reserve and fill IE */ |
356 | pos = skb_put(skb, sizeof(struct ieee80211_vht_capabilities) + 2); | 356 | pos = skb_put(skb, sizeof(struct ieee80211_vht_cap) + 2); |
357 | ieee80211_ie_build_vht_cap(pos, &vht_cap, cap); | 357 | ieee80211_ie_build_vht_cap(pos, &vht_cap, cap); |
358 | } | 358 | } |
359 | 359 | ||
@@ -412,7 +412,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata) | |||
412 | 4 + /* power capability */ | 412 | 4 + /* power capability */ |
413 | 2 + 2 * sband->n_channels + /* supported channels */ | 413 | 2 + 2 * sband->n_channels + /* supported channels */ |
414 | 2 + sizeof(struct ieee80211_ht_cap) + /* HT */ | 414 | 2 + sizeof(struct ieee80211_ht_cap) + /* HT */ |
415 | 2 + sizeof(struct ieee80211_vht_capabilities) + /* VHT */ | 415 | 2 + sizeof(struct ieee80211_vht_cap) + /* VHT */ |
416 | assoc_data->ie_len + /* extra IEs */ | 416 | assoc_data->ie_len + /* extra IEs */ |
417 | 9, /* WMM */ | 417 | 9, /* WMM */ |
418 | GFP_KERNEL); | 418 | GFP_KERNEL); |