diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-03-29 06:18:35 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-03-31 14:46:38 -0400 |
commit | e61146e36b40fd9d346118c40285913236c329f3 (patch) | |
tree | d98781250a92062e519798b69b0e0e8966ae259c /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
parent | e1b3ec1a2a336c328c336cfa5485a5f0484cc90d (diff) |
iwlwifi: manage QoS by mac stack
We activate/deactivate QoS and setup default queue parameters in iwlwifi
driver. Mac stack do the same, so we do not need repeat that work here.
Stack also will tell when disable QoS, this will fix driver when working
with older APs, that do not have QoS implemented.
Patch make "force = true" in iwl_active_qos() assuming we always want
to do with QoS what mac stack wish.
Patch also remove unused qos_cap bits, do not initialize qos_active = 0,
as we have it initialized to zero by kzalloc.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 4995134d7e4a..24c240d53f5c 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -3140,8 +3140,6 @@ void iwl3945_post_associate(struct iwl_priv *priv) | |||
3140 | break; | 3140 | break; |
3141 | } | 3141 | } |
3142 | 3142 | ||
3143 | iwl_activate_qos(priv, 0); | ||
3144 | |||
3145 | /* we have just associated, don't start scan too early */ | 3143 | /* we have just associated, don't start scan too early */ |
3146 | priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN; | 3144 | priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN; |
3147 | } | 3145 | } |
@@ -3889,11 +3887,6 @@ static int iwl3945_init_drv(struct iwl_priv *priv) | |||
3889 | priv->iw_mode = NL80211_IFTYPE_STATION; | 3887 | priv->iw_mode = NL80211_IFTYPE_STATION; |
3890 | priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF; | 3888 | priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF; |
3891 | 3889 | ||
3892 | iwl_reset_qos(priv); | ||
3893 | |||
3894 | priv->qos_data.qos_active = 0; | ||
3895 | priv->qos_data.qos_cap.val = 0; | ||
3896 | |||
3897 | priv->tx_power_user_lmt = IWL_DEFAULT_TX_POWER; | 3890 | priv->tx_power_user_lmt = IWL_DEFAULT_TX_POWER; |
3898 | 3891 | ||
3899 | if (eeprom->version < EEPROM_3945_EEPROM_VERSION) { | 3892 | if (eeprom->version < EEPROM_3945_EEPROM_VERSION) { |