diff options
author | Winkler, Tomas <tomas.winkler@intel.com> | 2008-10-29 17:05:44 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-11-10 15:17:36 -0500 |
commit | eb4779c40549f8e0dd45c9a30f279134c9a86131 (patch) | |
tree | b54ec0c0e85c207736c8d0a19ad88d56914861f2 | |
parent | 9c80c50211d638555bc4b160d9ccd348e98eedad (diff) |
iwlwifi: trivial removal of some 4965 remaining from iwl-agn-rs.h
This patch removes 4965 prefix from comments and one function
in iwl-agn-rs.h
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 8 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h index ccfafcfa4767..adcbf538ed54 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h | |||
@@ -294,7 +294,7 @@ static inline u8 first_antenna(u8 mask) | |||
294 | } | 294 | } |
295 | 295 | ||
296 | 296 | ||
297 | static inline u8 iwl4965_get_prev_ieee_rate(u8 rate_index) | 297 | static inline u8 iwl_get_prev_ieee_rate(u8 rate_index) |
298 | { | 298 | { |
299 | u8 rate = iwl_rates[rate_index].prev_ieee; | 299 | u8 rate = iwl_rates[rate_index].prev_ieee; |
300 | 300 | ||
@@ -304,11 +304,11 @@ static inline u8 iwl4965_get_prev_ieee_rate(u8 rate_index) | |||
304 | } | 304 | } |
305 | 305 | ||
306 | /** | 306 | /** |
307 | * iwl4965_rate_control_register - Register the rate control algorithm callbacks | 307 | * iwl_rate_control_register - Register the rate control algorithm callbacks |
308 | * | 308 | * |
309 | * Since the rate control algorithm is hardware specific, there is no need | 309 | * Since the rate control algorithm is hardware specific, there is no need |
310 | * or reason to place it as a stand alone module. The driver can call | 310 | * or reason to place it as a stand alone module. The driver can call |
311 | * iwl4965_rate_control_register in order to register the rate control callbacks | 311 | * iwl_rate_control_register in order to register the rate control callbacks |
312 | * with the mac80211 subsystem. This should be performed prior to calling | 312 | * with the mac80211 subsystem. This should be performed prior to calling |
313 | * ieee80211_register_hw | 313 | * ieee80211_register_hw |
314 | * | 314 | * |
@@ -316,7 +316,7 @@ static inline u8 iwl4965_get_prev_ieee_rate(u8 rate_index) | |||
316 | extern int iwlagn_rate_control_register(void); | 316 | extern int iwlagn_rate_control_register(void); |
317 | 317 | ||
318 | /** | 318 | /** |
319 | * iwl4965_rate_control_unregister - Unregister the rate control callbacks | 319 | * iwl_rate_control_unregister - Unregister the rate control callbacks |
320 | * | 320 | * |
321 | * This should be called after calling ieee80211_unregister_hw, but before | 321 | * This should be called after calling ieee80211_unregister_hw, but before |
322 | * the driver is unloaded. | 322 | * the driver is unloaded. |
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index bfc009ce8a94..0c5f1221b8f3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -870,7 +870,7 @@ static void iwl_sta_init_lq(struct iwl_priv *priv, const u8 *addr, int is_ap) | |||
870 | 870 | ||
871 | link_cmd.rs_table[i].rate_n_flags = | 871 | link_cmd.rs_table[i].rate_n_flags = |
872 | iwl_hw_set_rate_n_flags(iwl_rates[r].plcp, rate_flags); | 872 | iwl_hw_set_rate_n_flags(iwl_rates[r].plcp, rate_flags); |
873 | r = iwl4965_get_prev_ieee_rate(r); | 873 | r = iwl_get_prev_ieee_rate(r); |
874 | } | 874 | } |
875 | 875 | ||
876 | link_cmd.general_params.single_stream_ant_msk = | 876 | link_cmd.general_params.single_stream_ant_msk = |