diff options
author | Winkler, Tomas <tomas.winkler@intel.com> | 2008-12-18 21:37:03 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 15:58:52 -0500 |
commit | b936d9be05d66172b2c035eaca002a134f078c64 (patch) | |
tree | 50af2a51bab74b30eec7fc7a4e76cdcd7f0745ac /drivers/net/wireless/iwlwifi/iwl-3945.c | |
parent | 69d00d2722e7478e590e40b1a8b791b4aeea195f (diff) |
iwlwifi: 3945 remove current_rate from station entry.
This patch removes current_rate from station_entry it was write only
variable
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
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-3945.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index 5a316d501c32..c16640ddd3d6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
@@ -831,7 +831,6 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv, | |||
831 | struct ieee80211_tx_info *info, | 831 | struct ieee80211_tx_info *info, |
832 | struct ieee80211_hdr *hdr, int sta_id, int tx_id) | 832 | struct ieee80211_hdr *hdr, int sta_id, int tx_id) |
833 | { | 833 | { |
834 | unsigned long flags; | ||
835 | u16 hw_value = ieee80211_get_tx_rate(priv->hw, info)->hw_value; | 834 | u16 hw_value = ieee80211_get_tx_rate(priv->hw, info)->hw_value; |
836 | u16 rate_index = min(hw_value & 0xffff, IWL_RATE_COUNT - 1); | 835 | u16 rate_index = min(hw_value & 0xffff, IWL_RATE_COUNT - 1); |
837 | u16 rate_mask; | 836 | u16 rate_mask; |
@@ -848,17 +847,6 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv, | |||
848 | * in this running context */ | 847 | * in this running context */ |
849 | rate_mask = IWL_RATES_MASK; | 848 | rate_mask = IWL_RATES_MASK; |
850 | 849 | ||
851 | spin_lock_irqsave(&priv->sta_lock, flags); | ||
852 | |||
853 | priv->stations[sta_id].current_rate.rate_n_flags = rate; | ||
854 | |||
855 | if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) && | ||
856 | (sta_id != priv->hw_setting.bcast_sta_id) && | ||
857 | (sta_id != IWL_MULTICAST_ID)) | ||
858 | priv->stations[IWL_STA_ID].current_rate.rate_n_flags = rate; | ||
859 | |||
860 | spin_unlock_irqrestore(&priv->sta_lock, flags); | ||
861 | |||
862 | if (tx_id >= IWL_CMD_QUEUE_NUM) | 850 | if (tx_id >= IWL_CMD_QUEUE_NUM) |
863 | rts_retry_limit = 3; | 851 | rts_retry_limit = 3; |
864 | else | 852 | else |
@@ -921,7 +909,6 @@ u8 iwl3945_sync_sta(struct iwl3945_priv *priv, int sta_id, u16 tx_rate, u8 flags | |||
921 | 909 | ||
922 | station->sta.sta.modify_mask = STA_MODIFY_TX_RATE_MSK; | 910 | station->sta.sta.modify_mask = STA_MODIFY_TX_RATE_MSK; |
923 | station->sta.rate_n_flags = cpu_to_le16(tx_rate); | 911 | station->sta.rate_n_flags = cpu_to_le16(tx_rate); |
924 | station->current_rate.rate_n_flags = tx_rate; | ||
925 | station->sta.mode = STA_CONTROL_MODIFY_MSK; | 912 | station->sta.mode = STA_CONTROL_MODIFY_MSK; |
926 | 913 | ||
927 | spin_unlock_irqrestore(&priv->sta_lock, flags_spin); | 914 | spin_unlock_irqrestore(&priv->sta_lock, flags_spin); |