diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-02-21 11:36:01 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-06 10:35:47 -0500 |
commit | ee2aca343c9aa64d277a75a5df043299dc84cfd9 (patch) | |
tree | 697ac55d4d0119e97ead3a530ebac8cf37922f78 /net/wireless/core.h | |
parent | c8bb93f5f5d478a01db66127844d1d2dd30abec7 (diff) |
cfg80211: add ability to override VHT capabilities
For testing it's sometimes useful to be able to
override certain VHT capability advertisement,
add the ability to do that in cfg80211.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/core.h')
-rw-r--r-- | net/wireless/core.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index 3aec0e429d8a..c2f94f22bb22 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h | |||
@@ -335,7 +335,9 @@ int __cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev, | |||
335 | const u8 *ie, int ie_len, bool use_mfp, | 335 | const u8 *ie, int ie_len, bool use_mfp, |
336 | struct cfg80211_crypto_settings *crypt, | 336 | struct cfg80211_crypto_settings *crypt, |
337 | u32 assoc_flags, struct ieee80211_ht_cap *ht_capa, | 337 | u32 assoc_flags, struct ieee80211_ht_cap *ht_capa, |
338 | struct ieee80211_ht_cap *ht_capa_mask); | 338 | struct ieee80211_ht_cap *ht_capa_mask, |
339 | struct ieee80211_vht_cap *vht_capa, | ||
340 | struct ieee80211_vht_cap *vht_capa_mask); | ||
339 | int cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev, | 341 | int cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev, |
340 | struct net_device *dev, struct ieee80211_channel *chan, | 342 | struct net_device *dev, struct ieee80211_channel *chan, |
341 | const u8 *bssid, const u8 *prev_bssid, | 343 | const u8 *bssid, const u8 *prev_bssid, |
@@ -343,7 +345,9 @@ int cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev, | |||
343 | const u8 *ie, int ie_len, bool use_mfp, | 345 | const u8 *ie, int ie_len, bool use_mfp, |
344 | struct cfg80211_crypto_settings *crypt, | 346 | struct cfg80211_crypto_settings *crypt, |
345 | u32 assoc_flags, struct ieee80211_ht_cap *ht_capa, | 347 | u32 assoc_flags, struct ieee80211_ht_cap *ht_capa, |
346 | struct ieee80211_ht_cap *ht_capa_mask); | 348 | struct ieee80211_ht_cap *ht_capa_mask, |
349 | struct ieee80211_vht_cap *vht_capa, | ||
350 | struct ieee80211_vht_cap *vht_capa_mask); | ||
347 | int __cfg80211_mlme_deauth(struct cfg80211_registered_device *rdev, | 351 | int __cfg80211_mlme_deauth(struct cfg80211_registered_device *rdev, |
348 | struct net_device *dev, const u8 *bssid, | 352 | struct net_device *dev, const u8 *bssid, |
349 | const u8 *ie, int ie_len, u16 reason, | 353 | const u8 *ie, int ie_len, u16 reason, |
@@ -375,6 +379,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev, | |||
375 | bool no_cck, bool dont_wait_for_ack, u64 *cookie); | 379 | bool no_cck, bool dont_wait_for_ack, u64 *cookie); |
376 | void cfg80211_oper_and_ht_capa(struct ieee80211_ht_cap *ht_capa, | 380 | void cfg80211_oper_and_ht_capa(struct ieee80211_ht_cap *ht_capa, |
377 | const struct ieee80211_ht_cap *ht_capa_mask); | 381 | const struct ieee80211_ht_cap *ht_capa_mask); |
382 | void cfg80211_oper_and_vht_capa(struct ieee80211_vht_cap *vht_capa, | ||
383 | const struct ieee80211_vht_cap *vht_capa_mask); | ||
378 | 384 | ||
379 | /* SME */ | 385 | /* SME */ |
380 | int __cfg80211_connect(struct cfg80211_registered_device *rdev, | 386 | int __cfg80211_connect(struct cfg80211_registered_device *rdev, |