diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2017-12-12 05:44:13 -0500 |
---|---|---|
committer | Luca Coelho <luciano.coelho@intel.com> | 2017-12-20 11:28:24 -0500 |
commit | 556f4ef667554ada6bdfe4460cfc072c366d00a2 (patch) | |
tree | 5b2aec375fa102cb2835a08bcba24e50eae229ba | |
parent | 57df383902968a1cc187ea36cefe4b23a58dfdac (diff) |
iwlwifi: fw: fix the enums in the rate scaling API
We don't need the _enum suffix.
Also refer to &enum iwl_tlc_mng_vht_he_types instead
of %IWL_TLC_MNG_VALID_VHT_HE_TYPES_\*
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h b/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h index e9a6e5627f94..e49a6f7be613 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | |||
@@ -71,7 +71,7 @@ | |||
71 | * @IWL_TLC_MNG_CFG_FLAGS_BF_MSK: enable BFER | 71 | * @IWL_TLC_MNG_CFG_FLAGS_BF_MSK: enable BFER |
72 | * @IWL_TLC_MNG_CFG_FLAGS_DCM_MSK: enable DCM | 72 | * @IWL_TLC_MNG_CFG_FLAGS_DCM_MSK: enable DCM |
73 | */ | 73 | */ |
74 | enum iwl_tlc_mng_cfg_flags_enum { | 74 | enum iwl_tlc_mng_cfg_flags { |
75 | IWL_TLC_MNG_CFG_FLAGS_CCK_MSK = BIT(0), | 75 | IWL_TLC_MNG_CFG_FLAGS_CCK_MSK = BIT(0), |
76 | IWL_TLC_MNG_CFG_FLAGS_DD_MSK = BIT(1), | 76 | IWL_TLC_MNG_CFG_FLAGS_DD_MSK = BIT(1), |
77 | IWL_TLC_MNG_CFG_FLAGS_STBC_MSK = BIT(2), | 77 | IWL_TLC_MNG_CFG_FLAGS_STBC_MSK = BIT(2), |
@@ -81,14 +81,14 @@ enum iwl_tlc_mng_cfg_flags_enum { | |||
81 | }; | 81 | }; |
82 | 82 | ||
83 | /** | 83 | /** |
84 | * enum iwl_tlc_mng_cfg_cw_enum - channel width options | 84 | * enum iwl_tlc_mng_cfg_cw - channel width options |
85 | * @IWL_TLC_MNG_MAX_CH_WIDTH_20MHZ: 20MHZ channel | 85 | * @IWL_TLC_MNG_MAX_CH_WIDTH_20MHZ: 20MHZ channel |
86 | * @IWL_TLC_MNG_MAX_CH_WIDTH_40MHZ: 40MHZ channel | 86 | * @IWL_TLC_MNG_MAX_CH_WIDTH_40MHZ: 40MHZ channel |
87 | * @IWL_TLC_MNG_MAX_CH_WIDTH_80MHZ: 80MHZ channel | 87 | * @IWL_TLC_MNG_MAX_CH_WIDTH_80MHZ: 80MHZ channel |
88 | * @IWL_TLC_MNG_MAX_CH_WIDTH_160MHZ: 160MHZ channel | 88 | * @IWL_TLC_MNG_MAX_CH_WIDTH_160MHZ: 160MHZ channel |
89 | * @IWL_TLC_MNG_MAX_CH_WIDTH_LAST: maximum value | 89 | * @IWL_TLC_MNG_MAX_CH_WIDTH_LAST: maximum value |
90 | */ | 90 | */ |
91 | enum iwl_tlc_mng_cfg_cw_enum { | 91 | enum iwl_tlc_mng_cfg_cw { |
92 | IWL_TLC_MNG_MAX_CH_WIDTH_20MHZ, | 92 | IWL_TLC_MNG_MAX_CH_WIDTH_20MHZ, |
93 | IWL_TLC_MNG_MAX_CH_WIDTH_40MHZ, | 93 | IWL_TLC_MNG_MAX_CH_WIDTH_40MHZ, |
94 | IWL_TLC_MNG_MAX_CH_WIDTH_80MHZ, | 94 | IWL_TLC_MNG_MAX_CH_WIDTH_80MHZ, |
@@ -97,25 +97,25 @@ enum iwl_tlc_mng_cfg_cw_enum { | |||
97 | }; | 97 | }; |
98 | 98 | ||
99 | /** | 99 | /** |
100 | * enum iwl_tlc_mng_cfg_chains_enum - possible chains | 100 | * enum iwl_tlc_mng_cfg_chains - possible chains |
101 | * @IWL_TLC_MNG_CHAIN_A_MSK: chain A | 101 | * @IWL_TLC_MNG_CHAIN_A_MSK: chain A |
102 | * @IWL_TLC_MNG_CHAIN_B_MSK: chain B | 102 | * @IWL_TLC_MNG_CHAIN_B_MSK: chain B |
103 | * @IWL_TLC_MNG_CHAIN_C_MSK: chain C | 103 | * @IWL_TLC_MNG_CHAIN_C_MSK: chain C |
104 | */ | 104 | */ |
105 | enum iwl_tlc_mng_cfg_chains_enum { | 105 | enum iwl_tlc_mng_cfg_chains { |
106 | IWL_TLC_MNG_CHAIN_A_MSK = BIT(0), | 106 | IWL_TLC_MNG_CHAIN_A_MSK = BIT(0), |
107 | IWL_TLC_MNG_CHAIN_B_MSK = BIT(1), | 107 | IWL_TLC_MNG_CHAIN_B_MSK = BIT(1), |
108 | IWL_TLC_MNG_CHAIN_C_MSK = BIT(2), | 108 | IWL_TLC_MNG_CHAIN_C_MSK = BIT(2), |
109 | }; | 109 | }; |
110 | 110 | ||
111 | /** | 111 | /** |
112 | * enum iwl_tlc_mng_cfg_gi_enum - guard interval options | 112 | * enum iwl_tlc_mng_cfg_gi - guard interval options |
113 | * @IWL_TLC_MNG_SGI_20MHZ_MSK: enable short GI for 20MHZ | 113 | * @IWL_TLC_MNG_SGI_20MHZ_MSK: enable short GI for 20MHZ |
114 | * @IWL_TLC_MNG_SGI_40MHZ_MSK: enable short GI for 40MHZ | 114 | * @IWL_TLC_MNG_SGI_40MHZ_MSK: enable short GI for 40MHZ |
115 | * @IWL_TLC_MNG_SGI_80MHZ_MSK: enable short GI for 80MHZ | 115 | * @IWL_TLC_MNG_SGI_80MHZ_MSK: enable short GI for 80MHZ |
116 | * @IWL_TLC_MNG_SGI_160MHZ_MSK: enable short GI for 160MHZ | 116 | * @IWL_TLC_MNG_SGI_160MHZ_MSK: enable short GI for 160MHZ |
117 | */ | 117 | */ |
118 | enum iwl_tlc_mng_cfg_gi_enum { | 118 | enum iwl_tlc_mng_cfg_gi { |
119 | IWL_TLC_MNG_SGI_20MHZ_MSK = BIT(0), | 119 | IWL_TLC_MNG_SGI_20MHZ_MSK = BIT(0), |
120 | IWL_TLC_MNG_SGI_40MHZ_MSK = BIT(1), | 120 | IWL_TLC_MNG_SGI_40MHZ_MSK = BIT(1), |
121 | IWL_TLC_MNG_SGI_80MHZ_MSK = BIT(2), | 121 | IWL_TLC_MNG_SGI_80MHZ_MSK = BIT(2), |
@@ -123,7 +123,7 @@ enum iwl_tlc_mng_cfg_gi_enum { | |||
123 | }; | 123 | }; |
124 | 124 | ||
125 | /** | 125 | /** |
126 | * enum iwl_tlc_mng_cfg_mode_enum - supported modes | 126 | * enum iwl_tlc_mng_cfg_mode - supported modes |
127 | * @IWL_TLC_MNG_MODE_CCK: enable CCK | 127 | * @IWL_TLC_MNG_MODE_CCK: enable CCK |
128 | * @IWL_TLC_MNG_MODE_OFDM_NON_HT: enable OFDM (non HT) | 128 | * @IWL_TLC_MNG_MODE_OFDM_NON_HT: enable OFDM (non HT) |
129 | * @IWL_TLC_MNG_MODE_NON_HT: enable non HT | 129 | * @IWL_TLC_MNG_MODE_NON_HT: enable non HT |
@@ -133,7 +133,7 @@ enum iwl_tlc_mng_cfg_gi_enum { | |||
133 | * @IWL_TLC_MNG_MODE_INVALID: invalid value | 133 | * @IWL_TLC_MNG_MODE_INVALID: invalid value |
134 | * @IWL_TLC_MNG_MODE_NUM: a count of possible modes | 134 | * @IWL_TLC_MNG_MODE_NUM: a count of possible modes |
135 | */ | 135 | */ |
136 | enum iwl_tlc_mng_cfg_mode_enum { | 136 | enum iwl_tlc_mng_cfg_mode { |
137 | IWL_TLC_MNG_MODE_CCK = 0, | 137 | IWL_TLC_MNG_MODE_CCK = 0, |
138 | IWL_TLC_MNG_MODE_OFDM_NON_HT = IWL_TLC_MNG_MODE_CCK, | 138 | IWL_TLC_MNG_MODE_OFDM_NON_HT = IWL_TLC_MNG_MODE_CCK, |
139 | IWL_TLC_MNG_MODE_NON_HT = IWL_TLC_MNG_MODE_CCK, | 139 | IWL_TLC_MNG_MODE_NON_HT = IWL_TLC_MNG_MODE_CCK, |
@@ -145,14 +145,14 @@ enum iwl_tlc_mng_cfg_mode_enum { | |||
145 | }; | 145 | }; |
146 | 146 | ||
147 | /** | 147 | /** |
148 | * enum iwl_tlc_mng_vht_he_types_enum - VHT HE types | 148 | * enum iwl_tlc_mng_vht_he_types - VHT HE types |
149 | * @IWL_TLC_MNG_VALID_VHT_HE_TYPES_SU: VHT HT single user | 149 | * @IWL_TLC_MNG_VALID_VHT_HE_TYPES_SU: VHT HT single user |
150 | * @IWL_TLC_MNG_VALID_VHT_HE_TYPES_SU_EXT: VHT HT single user extended | 150 | * @IWL_TLC_MNG_VALID_VHT_HE_TYPES_SU_EXT: VHT HT single user extended |
151 | * @IWL_TLC_MNG_VALID_VHT_HE_TYPES_MU: VHT HT multiple users | 151 | * @IWL_TLC_MNG_VALID_VHT_HE_TYPES_MU: VHT HT multiple users |
152 | * @IWL_TLC_MNG_VALID_VHT_HE_TYPES_TRIG_BASED: trigger based | 152 | * @IWL_TLC_MNG_VALID_VHT_HE_TYPES_TRIG_BASED: trigger based |
153 | * @IWL_TLC_MNG_VALID_VHT_HE_TYPES_NUM: a count of possible types | 153 | * @IWL_TLC_MNG_VALID_VHT_HE_TYPES_NUM: a count of possible types |
154 | */ | 154 | */ |
155 | enum iwl_tlc_mng_vht_he_types_enum { | 155 | enum iwl_tlc_mng_vht_he_types { |
156 | IWL_TLC_MNG_VALID_VHT_HE_TYPES_SU = 0, | 156 | IWL_TLC_MNG_VALID_VHT_HE_TYPES_SU = 0, |
157 | IWL_TLC_MNG_VALID_VHT_HE_TYPES_SU_EXT, | 157 | IWL_TLC_MNG_VALID_VHT_HE_TYPES_SU_EXT, |
158 | IWL_TLC_MNG_VALID_VHT_HE_TYPES_MU, | 158 | IWL_TLC_MNG_VALID_VHT_HE_TYPES_MU, |
@@ -163,7 +163,7 @@ enum iwl_tlc_mng_vht_he_types_enum { | |||
163 | }; | 163 | }; |
164 | 164 | ||
165 | /** | 165 | /** |
166 | * enum iwl_tlc_mng_ht_rates_enum - HT/VHT rates | 166 | * enum iwl_tlc_mng_ht_rates - HT/VHT rates |
167 | * @IWL_TLC_MNG_HT_RATE_MCS0: index of MCS0 | 167 | * @IWL_TLC_MNG_HT_RATE_MCS0: index of MCS0 |
168 | * @IWL_TLC_MNG_HT_RATE_MCS1: index of MCS1 | 168 | * @IWL_TLC_MNG_HT_RATE_MCS1: index of MCS1 |
169 | * @IWL_TLC_MNG_HT_RATE_MCS2: index of MCS2 | 169 | * @IWL_TLC_MNG_HT_RATE_MCS2: index of MCS2 |
@@ -176,7 +176,7 @@ enum iwl_tlc_mng_vht_he_types_enum { | |||
176 | * @IWL_TLC_MNG_HT_RATE_MCS9: index of MCS9 | 176 | * @IWL_TLC_MNG_HT_RATE_MCS9: index of MCS9 |
177 | * @IWL_TLC_MNG_HT_RATE_MAX: maximal rate for HT/VHT | 177 | * @IWL_TLC_MNG_HT_RATE_MAX: maximal rate for HT/VHT |
178 | */ | 178 | */ |
179 | enum iwl_tlc_mng_ht_rates_enum { | 179 | enum iwl_tlc_mng_ht_rates { |
180 | IWL_TLC_MNG_HT_RATE_MCS0 = 0, | 180 | IWL_TLC_MNG_HT_RATE_MCS0 = 0, |
181 | IWL_TLC_MNG_HT_RATE_MCS1, | 181 | IWL_TLC_MNG_HT_RATE_MCS1, |
182 | IWL_TLC_MNG_HT_RATE_MCS2, | 182 | IWL_TLC_MNG_HT_RATE_MCS2, |
@@ -198,13 +198,13 @@ enum iwl_tlc_mng_ht_rates_enum { | |||
198 | * @sta_id: station id | 198 | * @sta_id: station id |
199 | * @reserved1: reserved | 199 | * @reserved1: reserved |
200 | * @max_supp_ch_width: channel width | 200 | * @max_supp_ch_width: channel width |
201 | * @flags: bitmask of %IWL_TLC_MNG_CONFIG_FLAGS_ENABLE_\* | 201 | * @flags: bitmask of &enum iwl_tlc_mng_cfg_flags |
202 | * @chains: bitmask of %IWL_TLC_MNG_CHAIN_\* | 202 | * @chains: bitmask of &enum iwl_tlc_mng_cfg_chains |
203 | * @max_supp_ss: valid values are 0-3, 0 - spatial streams are not supported | 203 | * @max_supp_ss: valid values are 0-3, 0 - spatial streams are not supported |
204 | * @valid_vht_he_types: bitmap of %IWL_TLC_MNG_VALID_VHT_HE_TYPES_\* | 204 | * @valid_vht_he_types: bitmap of &enum iwl_tlc_mng_vht_he_types |
205 | * @non_ht_supp_rates: bitmap of supported legacy rates | 205 | * @non_ht_supp_rates: bitmap of supported legacy rates |
206 | * @ht_supp_rates: bitmap of supported HT/VHT rates, valid bits are 0-9 | 206 | * @ht_supp_rates: bitmap of supported HT/VHT rates, valid bits are 0-9 |
207 | * @mode: modulation type %IWL_TLC_MNG_MODE_\* | 207 | * @mode: &enum iwl_tlc_mng_cfg_mode |
208 | * @reserved2: reserved | 208 | * @reserved2: reserved |
209 | * @he_supp_rates: bitmap of supported HE rates | 209 | * @he_supp_rates: bitmap of supported HE rates |
210 | * @sgi_ch_width_supp: bitmap of SGI support per channel width | 210 | * @sgi_ch_width_supp: bitmap of SGI support per channel width |