diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 1d95e8c65276..b719d19361ac 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include "iwl-io.h" | 44 | #include "iwl-io.h" |
45 | #include "iwl-helpers.h" | 45 | #include "iwl-helpers.h" |
46 | #include "iwl-calib.h" | 46 | #include "iwl-calib.h" |
47 | #include "iwl-sta.h" | ||
47 | 48 | ||
48 | /* module parameters */ | 49 | /* module parameters */ |
49 | static struct iwl_mod_params iwl4965_mod_params = { | 50 | static struct iwl_mod_params iwl4965_mod_params = { |
@@ -2900,24 +2901,6 @@ static void iwl4965_rx_reply_rx_phy(struct iwl_priv *priv, | |||
2900 | #ifdef CONFIG_IWL4965_HT | 2901 | #ifdef CONFIG_IWL4965_HT |
2901 | 2902 | ||
2902 | /** | 2903 | /** |
2903 | * iwl4965_sta_modify_enable_tid_tx - Enable Tx for this TID in station table | ||
2904 | */ | ||
2905 | static void iwl4965_sta_modify_enable_tid_tx(struct iwl_priv *priv, | ||
2906 | int sta_id, int tid) | ||
2907 | { | ||
2908 | unsigned long flags; | ||
2909 | |||
2910 | /* Remove "disable" flag, to enable Tx for this TID */ | ||
2911 | spin_lock_irqsave(&priv->sta_lock, flags); | ||
2912 | priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_TID_DISABLE_TX; | ||
2913 | priv->stations[sta_id].sta.tid_disable_tx &= cpu_to_le16(~(1 << tid)); | ||
2914 | priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; | ||
2915 | spin_unlock_irqrestore(&priv->sta_lock, flags); | ||
2916 | |||
2917 | iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC); | ||
2918 | } | ||
2919 | |||
2920 | /** | ||
2921 | * iwl4965_tx_status_reply_compressed_ba - Update tx status from block-ack | 2904 | * iwl4965_tx_status_reply_compressed_ba - Update tx status from block-ack |
2922 | * | 2905 | * |
2923 | * Go through block-ack's bitmap of ACK'd frames, update driver's record of | 2906 | * Go through block-ack's bitmap of ACK'd frames, update driver's record of |
@@ -3193,7 +3176,7 @@ static int iwl4965_tx_queue_agg_enable(struct iwl_priv *priv, int txq_id, | |||
3193 | ra_tid = BUILD_RAxTID(sta_id, tid); | 3176 | ra_tid = BUILD_RAxTID(sta_id, tid); |
3194 | 3177 | ||
3195 | /* Modify device's station table to Tx this TID */ | 3178 | /* Modify device's station table to Tx this TID */ |
3196 | iwl4965_sta_modify_enable_tid_tx(priv, sta_id, tid); | 3179 | iwl_sta_modify_enable_tid_tx(priv, sta_id, tid); |
3197 | 3180 | ||
3198 | spin_lock_irqsave(&priv->lock, flags); | 3181 | spin_lock_irqsave(&priv->lock, flags); |
3199 | rc = iwl_grab_nic_access(priv); | 3182 | rc = iwl_grab_nic_access(priv); |