diff options
author | Winkler, Tomas <tomas.winkler@intel.com> | 2008-12-09 14:29:01 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-12-12 14:01:53 -0500 |
commit | 30dab79ed40f6c0f8a24e25fd9be7bd873eeeb8b (patch) | |
tree | cd4547593d56ffe202e548d84059aca880944091 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | 6d1ef1a3e6b4915d4cde897971ce283bdf0d9fbc (diff) |
iwlwifi: remove qos module parameter
The ability of disabling qos from module params is not required anymore.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 344225a3eb54..3f425f68b2ca 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -546,9 +546,6 @@ static void iwl_activate_qos(struct iwl_priv *priv, u8 force) | |||
546 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) | 546 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) |
547 | return; | 547 | return; |
548 | 548 | ||
549 | if (!priv->qos_data.qos_enable) | ||
550 | return; | ||
551 | |||
552 | priv->qos_data.def_qos_parm.qos_flags = 0; | 549 | priv->qos_data.def_qos_parm.qos_flags = 0; |
553 | 550 | ||
554 | if (priv->qos_data.qos_cap.q_AP.queue_request && | 551 | if (priv->qos_data.qos_cap.q_AP.queue_request && |
@@ -3112,11 +3109,6 @@ static int iwl_mac_conf_tx(struct ieee80211_hw *hw, u16 queue, | |||
3112 | return 0; | 3109 | return 0; |
3113 | } | 3110 | } |
3114 | 3111 | ||
3115 | if (!priv->qos_data.qos_enable) { | ||
3116 | priv->qos_data.qos_active = 0; | ||
3117 | IWL_DEBUG_MAC80211("leave - qos not enabled\n"); | ||
3118 | return 0; | ||
3119 | } | ||
3120 | q = AC_NUM - 1 - queue; | 3112 | q = AC_NUM - 1 - queue; |
3121 | 3113 | ||
3122 | spin_lock_irqsave(&priv->lock, flags); | 3114 | spin_lock_irqsave(&priv->lock, flags); |