aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl4965-base.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2007-10-25 05:15:26 -0400
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:03:10 -0500
commitf1f1f5c730a3598b36989c63d387d9cab63161c7 (patch)
treec05a76b68e134d0aa8fd0b4a1cff0999972c9d95 /drivers/net/wireless/iwlwifi/iwl4965-base.c
parentdc2453ae81785f7e4f48485013b89df0a951421e (diff)
iwlwifi: add TGN flag to qos parameters
This patch adds TGN flag to QoS parameters. This flag governs enablement of NAV shortening with CF-End and filters in 4 or 8K RX AMSDU packets Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index e0feca8acddb..0a878cf49e07 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -2057,16 +2057,21 @@ static void iwl_activate_qos(struct iwl_priv *priv, u8 force)
2057 !priv->qos_data.qos_cap.q_AP.txop_request) 2057 !priv->qos_data.qos_cap.q_AP.txop_request)
2058 priv->qos_data.def_qos_parm.qos_flags |= 2058 priv->qos_data.def_qos_parm.qos_flags |=
2059 QOS_PARAM_FLG_TXOP_TYPE_MSK; 2059 QOS_PARAM_FLG_TXOP_TYPE_MSK;
2060
2061 if (priv->qos_data.qos_active) 2060 if (priv->qos_data.qos_active)
2062 priv->qos_data.def_qos_parm.qos_flags |= 2061 priv->qos_data.def_qos_parm.qos_flags |=
2063 QOS_PARAM_FLG_UPDATE_EDCA_MSK; 2062 QOS_PARAM_FLG_UPDATE_EDCA_MSK;
2064 2063
2064#ifdef CONFIG_IWLWIFI_HT
2065 if (priv->is_ht_enabled && priv->current_assoc_ht.is_ht)
2066 priv->qos_data.def_qos_parm.qos_flags |= QOS_PARAM_FLG_TGN_MSK;
2067#endif /* CONFIG_IWLWIFI_HT */
2068
2065 spin_unlock_irqrestore(&priv->lock, flags); 2069 spin_unlock_irqrestore(&priv->lock, flags);
2066 2070
2067 if (force || iwl_is_associated(priv)) { 2071 if (force || iwl_is_associated(priv)) {
2068 IWL_DEBUG_QOS("send QoS cmd with Qos active %d \n", 2072 IWL_DEBUG_QOS("send QoS cmd with Qos active=%d FLAGS=0x%X\n",
2069 priv->qos_data.qos_active); 2073 priv->qos_data.qos_active,
2074 priv->qos_data.def_qos_parm.qos_flags);
2070 2075
2071 iwl_send_qos_params_command(priv, 2076 iwl_send_qos_params_command(priv,
2072 &(priv->qos_data.def_qos_parm)); 2077 &(priv->qos_data.def_qos_parm));