diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-11-23 04:06:12 -0500 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-12-16 10:23:20 -0500 |
commit | 04cf6824a5e92e6f86c0abcb38ac65ee744c3d34 (patch) | |
tree | ead9f6d11ac188cda9ce0f21ba5ec84d75696641 /drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |
parent | 97756fb1c39d58b76ee1488ac894ee81eaf17ba9 (diff) |
iwlwifi: tid_data moves to iwl_priv
The transport doesn't need to access it any more.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rs.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index bc0c924d0c95..334b5ae8fdd4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |||
@@ -2273,7 +2273,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, | |||
2273 | tid = rs_tl_add_packet(lq_sta, hdr); | 2273 | tid = rs_tl_add_packet(lq_sta, hdr); |
2274 | if ((tid != IWL_MAX_TID_COUNT) && | 2274 | if ((tid != IWL_MAX_TID_COUNT) && |
2275 | (lq_sta->tx_agg_tid_en & (1 << tid))) { | 2275 | (lq_sta->tx_agg_tid_en & (1 << tid))) { |
2276 | tid_data = &priv->shrd->tid_data[lq_sta->lq.sta_id][tid]; | 2276 | tid_data = &priv->tid_data[lq_sta->lq.sta_id][tid]; |
2277 | if (tid_data->agg.state == IWL_AGG_OFF) | 2277 | if (tid_data->agg.state == IWL_AGG_OFF) |
2278 | lq_sta->is_agg = 0; | 2278 | lq_sta->is_agg = 0; |
2279 | else | 2279 | else |
@@ -2645,8 +2645,7 @@ lq_update: | |||
2645 | (lq_sta->tx_agg_tid_en & (1 << tid)) && | 2645 | (lq_sta->tx_agg_tid_en & (1 << tid)) && |
2646 | (tid != IWL_MAX_TID_COUNT)) { | 2646 | (tid != IWL_MAX_TID_COUNT)) { |
2647 | u8 sta_id = lq_sta->lq.sta_id; | 2647 | u8 sta_id = lq_sta->lq.sta_id; |
2648 | tid_data = | 2648 | tid_data = &priv->tid_data[sta_id][tid]; |
2649 | &priv->shrd->tid_data[sta_id][tid]; | ||
2650 | if (tid_data->agg.state == IWL_AGG_OFF) { | 2649 | if (tid_data->agg.state == IWL_AGG_OFF) { |
2651 | IWL_DEBUG_RATE(priv, | 2650 | IWL_DEBUG_RATE(priv, |
2652 | "try to aggregate tid %d\n", | 2651 | "try to aggregate tid %d\n", |