diff options
author | Janusz Dziedzic <janusz.dziedzic@tieto.com> | 2013-12-05 04:02:15 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-05 10:39:07 -0500 |
commit | d1e33e654ef6bb3dee766353ed9dd31e7dcb8a94 (patch) | |
tree | 7b5d1f16c019183dc4110782ae621e670b057c0c /include/uapi | |
parent | b9243ab0c9e3e4dbd54ae8f44cf0cdb5838c8746 (diff) |
cfg80211: in bitrate_mask, rename mcs to ht_mcs
Rename NL80211_TXRATE_MCS to NL80211_TXRATE_HT and also
rename mcs to ht_mcs in struct cfg80211_bitrate_mask.
Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
[reword commit message]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/linux/nl80211.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 72ba3584c90d..6e700645cd27 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h | |||
@@ -3110,7 +3110,7 @@ enum nl80211_key_attributes { | |||
3110 | * in an array of rates as defined in IEEE 802.11 7.3.2.2 (u8 values with | 3110 | * in an array of rates as defined in IEEE 802.11 7.3.2.2 (u8 values with |
3111 | * 1 = 500 kbps) but without the IE length restriction (at most | 3111 | * 1 = 500 kbps) but without the IE length restriction (at most |
3112 | * %NL80211_MAX_SUPP_RATES in a single array). | 3112 | * %NL80211_MAX_SUPP_RATES in a single array). |
3113 | * @NL80211_TXRATE_MCS: HT (MCS) rates allowed for TX rate selection | 3113 | * @NL80211_TXRATE_HT: HT (MCS) rates allowed for TX rate selection |
3114 | * in an array of MCS numbers. | 3114 | * in an array of MCS numbers. |
3115 | * @__NL80211_TXRATE_AFTER_LAST: internal | 3115 | * @__NL80211_TXRATE_AFTER_LAST: internal |
3116 | * @NL80211_TXRATE_MAX: highest TX rate attribute | 3116 | * @NL80211_TXRATE_MAX: highest TX rate attribute |
@@ -3118,13 +3118,15 @@ enum nl80211_key_attributes { | |||
3118 | enum nl80211_tx_rate_attributes { | 3118 | enum nl80211_tx_rate_attributes { |
3119 | __NL80211_TXRATE_INVALID, | 3119 | __NL80211_TXRATE_INVALID, |
3120 | NL80211_TXRATE_LEGACY, | 3120 | NL80211_TXRATE_LEGACY, |
3121 | NL80211_TXRATE_MCS, | 3121 | NL80211_TXRATE_HT, |
3122 | 3122 | ||
3123 | /* keep last */ | 3123 | /* keep last */ |
3124 | __NL80211_TXRATE_AFTER_LAST, | 3124 | __NL80211_TXRATE_AFTER_LAST, |
3125 | NL80211_TXRATE_MAX = __NL80211_TXRATE_AFTER_LAST - 1 | 3125 | NL80211_TXRATE_MAX = __NL80211_TXRATE_AFTER_LAST - 1 |
3126 | }; | 3126 | }; |
3127 | 3127 | ||
3128 | #define NL80211_TXRATE_MCS NL80211_TXRATE_HT | ||
3129 | |||
3128 | /** | 3130 | /** |
3129 | * enum nl80211_band - Frequency band | 3131 | * enum nl80211_band - Frequency band |
3130 | * @NL80211_BAND_2GHZ: 2.4 GHz ISM band | 3132 | * @NL80211_BAND_2GHZ: 2.4 GHz ISM band |