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>

diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index e0feca8acddb6ec0221206354feb6b372c0b4237..0a878cf49e07a190ba02d5f3ce3594b33fbca937 100644 (file)
--- 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)
            !priv->qos_data.qos_cap.q_AP.txop_request)
                priv->qos_data.def_qos_parm.qos_flags |=
                        QOS_PARAM_FLG_TXOP_TYPE_MSK;
-
        if (priv->qos_data.qos_active)
                priv->qos_data.def_qos_parm.qos_flags |=
                        QOS_PARAM_FLG_UPDATE_EDCA_MSK;
 
+#ifdef CONFIG_IWLWIFI_HT
+       if (priv->is_ht_enabled && priv->current_assoc_ht.is_ht)
+               priv->qos_data.def_qos_parm.qos_flags |= QOS_PARAM_FLG_TGN_MSK;
+#endif /* CONFIG_IWLWIFI_HT */
+
        spin_unlock_irqrestore(&priv->lock, flags);
 
        if (force || iwl_is_associated(priv)) {
-               IWL_DEBUG_QOS("send QoS cmd with Qos active %d \n",
-                             priv->qos_data.qos_active);
+               IWL_DEBUG_QOS("send QoS cmd with Qos active=%d FLAGS=0x%X\n",
+                               priv->qos_data.qos_active,
+                               priv->qos_data.def_qos_parm.qos_flags);
 
                iwl_send_qos_params_command(priv,
                                &(priv->qos_data.def_qos_parm));