aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-4965.c
diff options
context:
space:
mode:
authorAbhijeet Kolekar <abhijeet.kolekar@intel.com>2009-10-09 16:20:30 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:48:00 -0400
commit37dc70fea870ced8fbd9ae786701529e7ce48f03 (patch)
tree27edb05a98dac5c501fff4fad9edffbb1175f73e /drivers/net/wireless/iwlwifi/iwl-4965.c
parent92a35bda792cf9295b1d399f7c937d4560292b1e (diff)
iwlwifi/iwl3945: unify rts_tx_cmd_flag
3945 and 4965 share the functionality for setting RTS and CTS to the tx_cmd. Unify these functions and move the common functionality to core. Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index c9d90169ab1a..6d77039b4ed2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -484,18 +484,6 @@ static void iwl4965_gain_computation(struct iwl_priv *priv,
484 data->beacon_count = 0; 484 data->beacon_count = 0;
485} 485}
486 486
487static void iwl4965_rts_tx_cmd_flag(struct ieee80211_tx_info *info,
488 __le32 *tx_flags)
489{
490 if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) {
491 *tx_flags |= TX_CMD_FLG_RTS_MSK;
492 *tx_flags &= ~TX_CMD_FLG_CTS_MSK;
493 } else if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT) {
494 *tx_flags &= ~TX_CMD_FLG_RTS_MSK;
495 *tx_flags |= TX_CMD_FLG_CTS_MSK;
496 }
497}
498
499static void iwl4965_bg_txpower_work(struct work_struct *work) 487static void iwl4965_bg_txpower_work(struct work_struct *work)
500{ 488{
501 struct iwl_priv *priv = container_of(work, struct iwl_priv, 489 struct iwl_priv *priv = container_of(work, struct iwl_priv,
@@ -2212,7 +2200,7 @@ static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = {
2212 .build_addsta_hcmd = iwl4965_build_addsta_hcmd, 2200 .build_addsta_hcmd = iwl4965_build_addsta_hcmd,
2213 .chain_noise_reset = iwl4965_chain_noise_reset, 2201 .chain_noise_reset = iwl4965_chain_noise_reset,
2214 .gain_computation = iwl4965_gain_computation, 2202 .gain_computation = iwl4965_gain_computation,
2215 .rts_tx_cmd_flag = iwl4965_rts_tx_cmd_flag, 2203 .rts_tx_cmd_flag = iwlcore_rts_tx_cmd_flag,
2216 .calc_rssi = iwl4965_calc_rssi, 2204 .calc_rssi = iwl4965_calc_rssi,
2217}; 2205};
2218 2206