Procházet zdrojové kódy

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>
Winkler, Tomas před 16 roky
rodič
revize
b936d9be05

+ 0 - 13
drivers/net/wireless/iwlwifi/iwl-3945.c

@@ -831,7 +831,6 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv,
 			      struct ieee80211_tx_info *info,
 			      struct ieee80211_tx_info *info,
 			      struct ieee80211_hdr *hdr, int sta_id, int tx_id)
 			      struct ieee80211_hdr *hdr, int sta_id, int tx_id)
 {
 {
-	unsigned long flags;
 	u16 hw_value = ieee80211_get_tx_rate(priv->hw, info)->hw_value;
 	u16 hw_value = ieee80211_get_tx_rate(priv->hw, info)->hw_value;
 	u16 rate_index = min(hw_value & 0xffff, IWL_RATE_COUNT - 1);
 	u16 rate_index = min(hw_value & 0xffff, IWL_RATE_COUNT - 1);
 	u16 rate_mask;
 	u16 rate_mask;
@@ -848,17 +847,6 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv,
 	 * in this running context */
 	 * in this running context */
 	rate_mask = IWL_RATES_MASK;
 	rate_mask = IWL_RATES_MASK;
 
 
-	spin_lock_irqsave(&priv->sta_lock, flags);
-
-	priv->stations[sta_id].current_rate.rate_n_flags = rate;
-
-	if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) &&
-	    (sta_id != priv->hw_setting.bcast_sta_id) &&
-		(sta_id != IWL_MULTICAST_ID))
-		priv->stations[IWL_STA_ID].current_rate.rate_n_flags = rate;
-
-	spin_unlock_irqrestore(&priv->sta_lock, flags);
-
 	if (tx_id >= IWL_CMD_QUEUE_NUM)
 	if (tx_id >= IWL_CMD_QUEUE_NUM)
 		rts_retry_limit = 3;
 		rts_retry_limit = 3;
 	else
 	else
@@ -921,7 +909,6 @@ u8 iwl3945_sync_sta(struct iwl3945_priv *priv, int sta_id, u16 tx_rate, u8 flags
 
 
 	station->sta.sta.modify_mask = STA_MODIFY_TX_RATE_MSK;
 	station->sta.sta.modify_mask = STA_MODIFY_TX_RATE_MSK;
 	station->sta.rate_n_flags = cpu_to_le16(tx_rate);
 	station->sta.rate_n_flags = cpu_to_le16(tx_rate);
-	station->current_rate.rate_n_flags = tx_rate;
 	station->sta.mode = STA_CONTROL_MODIFY_MSK;
 	station->sta.mode = STA_CONTROL_MODIFY_MSK;
 
 
 	spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
 	spin_unlock_irqrestore(&priv->sta_lock, flags_spin);

+ 0 - 7
drivers/net/wireless/iwlwifi/iwl-3945.h

@@ -481,13 +481,6 @@ struct iwl3945_qos_info {
 struct iwl3945_station_entry {
 struct iwl3945_station_entry {
 	struct iwl3945_addsta_cmd sta;
 	struct iwl3945_addsta_cmd sta;
 	struct iwl3945_tid_data tid[MAX_TID_COUNT];
 	struct iwl3945_tid_data tid[MAX_TID_COUNT];
-	union {
-		struct {
-			u8 rate;
-			u8 flags;
-		} s;
-		u16 rate_n_flags;
-	} current_rate;
 	u8 used;
 	u8 used;
 	u8 ps_status;
 	u8 ps_status;
 	struct iwl3945_hw_key keyinfo;
 	struct iwl3945_hw_key keyinfo;

+ 0 - 2
drivers/net/wireless/iwlwifi/iwl3945-base.c

@@ -462,8 +462,6 @@ u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap, u8
 	/* Turn on both antennas for the station... */
 	/* Turn on both antennas for the station... */
 	station->sta.rate_n_flags =
 	station->sta.rate_n_flags =
 			iwl3945_hw_set_rate_n_flags(rate, RATE_MCS_ANT_AB_MSK);
 			iwl3945_hw_set_rate_n_flags(rate, RATE_MCS_ANT_AB_MSK);
-	station->current_rate.rate_n_flags =
-			le16_to_cpu(station->sta.rate_n_flags);
 
 
 	spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
 	spin_unlock_irqrestore(&priv->sta_lock, flags_spin);