1 files changed, 39 insertions, 37 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index a8223c4cc97c..08604eb8291b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -158,9 +158,9 @@ static void iwl3945_clear_window(struct iwl3945_rate_scale_data *window)
 {
         window->data = 0;
         window->success_counter = 0;
-        window->success_ratio = IWL_INVALID_VALUE;
+        window->success_ratio = -1;
         window->counter = 0;
-        window->average_tpt = IWL_INVALID_VALUE;
+        window->average_tpt = IWL_INV_TPT;
         window->stamp = 0;
 }
 
@@ -459,22 +459,23 @@ static void rs_tx_status(void *priv_rate,
         struct iwl3945_rs_sta *rs_sta;
         struct ieee80211_supported_band *sband;
 
+        IWL_DEBUG_RATE("enter\n");
+
         sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
 
-        IWL_DEBUG_RATE("enter\n");
 
         retries = tx_resp->retry_count;
-        /* FIXME : this is wrong */
-        first_index = &sband->bitrates[0] - tx_resp->control.tx_rate;
+        first_index = tx_resp->control.tx_rate->hw_value;
         if ((first_index < 0) || (first_index >= IWL_RATE_COUNT)) {
                 IWL_DEBUG_RATE("leave: Rate out of bounds: %d\n", first_index);
                 return;
         }
 
+        rcu_read_lock();
+
         sta = sta_info_get(local, hdr->addr1);
         if (!sta || !sta->rate_ctrl_priv) {
-                if (sta)
-                        sta_info_put(sta);
+                rcu_read_unlock();
                 IWL_DEBUG_RATE("leave: No STA priv data to update!\n");
                 return;
         }
@@ -547,7 +548,7 @@ static void rs_tx_status(void *priv_rate,
 
         spin_unlock_irqrestore(&rs_sta->lock, flags);
 
-        sta_info_put(sta);
+        rcu_read_unlock();
 
         IWL_DEBUG_RATE("leave\n");
 
@@ -633,7 +634,7 @@ static u16 iwl3945_get_adjacent_rate(struct iwl3945_rs_sta *rs_sta,
  *
  */
 static void rs_get_rate(void *priv_rate, struct net_device *dev,
-                        struct ieee80211_supported_band *band,
+                        struct ieee80211_supported_band *sband,
                         struct sk_buff *skb,
                         struct rate_selection *sel)
 {
@@ -643,9 +644,9 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
         int index;
         struct iwl3945_rs_sta *rs_sta;
         struct iwl3945_rate_scale_data *window = NULL;
-        int current_tpt = IWL_INVALID_VALUE;
-        int low_tpt = IWL_INVALID_VALUE;
-        int high_tpt = IWL_INVALID_VALUE;
+        int current_tpt = IWL_INV_TPT;
+        int low_tpt = IWL_INV_TPT;
+        int high_tpt = IWL_INV_TPT;
         u32 fail_count;
         s8 scale_action = 0;
         unsigned long flags;
@@ -658,6 +659,8 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
 
         IWL_DEBUG_RATE("enter\n");
 
+        rcu_read_lock();
+
         sta = sta_info_get(local, hdr->addr1);
 
         /* Send management frames and broadcast/multicast data using lowest
@@ -667,16 +670,15 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
             is_multicast_ether_addr(hdr->addr1) ||
             !sta || !sta->rate_ctrl_priv) {
                 IWL_DEBUG_RATE("leave: No STA priv data to update!\n");
-                sel->rate = rate_lowest(local, band, sta);
-                if (sta)
-                        sta_info_put(sta);
+                sel->rate = rate_lowest(local, sband, sta);
+                rcu_read_unlock();
                 return;
         }
 
-        rate_mask = sta->supp_rates[band->band];
+        rate_mask = sta->supp_rates[sband->band];
         index = min(sta->last_txrate_idx & 0xffff, IWL_RATE_COUNT - 1);
 
-        if (priv->band == IEEE80211_BAND_5GHZ)
+        if (sband->band == IEEE80211_BAND_5GHZ)
                 rate_mask = rate_mask << IWL_FIRST_OFDM_RATE;
 
         rs_sta = (void *)sta->rate_ctrl_priv;
@@ -708,7 +710,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
 
         if (((fail_count <= IWL_RATE_MIN_FAILURE_TH) &&
              (window->success_counter < IWL_RATE_MIN_SUCCESS_TH))) {
-                window->average_tpt = IWL_INVALID_VALUE;
+                window->average_tpt = IWL_INV_TPT;
                 spin_unlock_irqrestore(&rs_sta->lock, flags);
 
                 IWL_DEBUG_RATE("Invalid average_tpt on rate %d: "
@@ -727,7 +729,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
         current_tpt = window->average_tpt;
 
         high_low = iwl3945_get_adjacent_rate(rs_sta, index, rate_mask,
-                                             band->band);
+                                             sband->band);
         low = high_low & 0xff;
         high = (high_low >> 8) & 0xff;
 
@@ -744,19 +746,16 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
         if ((window->success_ratio < IWL_RATE_DECREASE_TH) || !current_tpt) {
                 IWL_DEBUG_RATE("decrease rate because of low success_ratio\n");
                 scale_action = -1;
-        } else if ((low_tpt == IWL_INVALID_VALUE) &&
-                   (high_tpt == IWL_INVALID_VALUE))
+        } else if ((low_tpt == IWL_INV_TPT) && (high_tpt == IWL_INV_TPT))
                 scale_action = 1;
-        else if ((low_tpt != IWL_INVALID_VALUE) &&
-                   (high_tpt != IWL_INVALID_VALUE)
-                   && (low_tpt < current_tpt)
-                   && (high_tpt < current_tpt)) {
+        else if ((low_tpt != IWL_INV_TPT) && (high_tpt != IWL_INV_TPT) &&
+                 (low_tpt < current_tpt) && (high_tpt < current_tpt)) {
                 IWL_DEBUG_RATE("No action -- low [%d] & high [%d] < "
                                "current_tpt [%d]\n",
                                low_tpt, high_tpt, current_tpt);
                 scale_action = 0;
         } else {
-                if (high_tpt != IWL_INVALID_VALUE) {
+                if (high_tpt != IWL_INV_TPT) {
                         if (high_tpt > current_tpt)
                                 scale_action = 1;
                         else {
@@ -764,7 +763,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
                                     ("decrease rate because of high tpt\n");
                                 scale_action = -1;
                         }
-                } else if (low_tpt != IWL_INVALID_VALUE) {
+                } else if (low_tpt != IWL_INV_TPT) {
                         if (low_tpt > current_tpt) {
                                 IWL_DEBUG_RATE
                                     ("decrease rate because of low tpt\n");
@@ -806,16 +805,16 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
  out:
 
         sta->last_txrate_idx = index;
-        if (priv->band == IEEE80211_BAND_5GHZ)
+        if (sband->band == IEEE80211_BAND_5GHZ)
                 sta->txrate_idx = sta->last_txrate_idx - IWL_FIRST_OFDM_RATE;
         else
                 sta->txrate_idx = sta->last_txrate_idx;
 
-        sta_info_put(sta);
+        rcu_read_unlock();
 
         IWL_DEBUG_RATE("leave: %d\n", index);
 
-        sel->rate = &priv->ieee_rates[index];
+        sel->rate = &sband->bitrates[sta->txrate_idx];
 }
 
 static struct rate_control_ops rs_ops = {
@@ -843,13 +842,15 @@ int iwl3945_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
         unsigned long now = jiffies;
         u32 max_time = 0;
 
+        rcu_read_lock();
+
         sta = sta_info_get(local, priv->stations[sta_id].sta.sta.addr);
         if (!sta || !sta->rate_ctrl_priv) {
-                if (sta) {
-                        sta_info_put(sta);
+                if (sta)
                         IWL_DEBUG_RATE("leave - no private rate data!\n");
-                } else
+                else
                         IWL_DEBUG_RATE("leave - no station!\n");
+                rcu_read_unlock();
                 return sprintf(buf, "station %d not found\n", sta_id);
         }
 
@@ -890,7 +891,7 @@ int iwl3945_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
                 i = j;
         }
         spin_unlock_irqrestore(&rs_sta->lock, flags);
-        sta_info_put(sta);
+        rcu_read_unlock();
 
         /* Display the average rate of all samples taken.
          *
@@ -927,11 +928,12 @@ void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
                 return;
         }
 
+        rcu_read_lock();
+
         sta = sta_info_get(local, priv->stations[sta_id].sta.sta.addr);
         if (!sta || !sta->rate_ctrl_priv) {
-                if (sta)
-                        sta_info_put(sta);
                 IWL_DEBUG_RATE("leave - no private rate data!\n");
+                rcu_read_unlock();
                 return;
         }
 
@@ -958,7 +960,7 @@ void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
                 break;
         }
 
-        sta_info_put(sta);
+        rcu_read_unlock();
         spin_unlock_irqrestore(&rs_sta->lock, flags);
 
         rssi = priv->last_rx_rssi;