mwifiex: disable uapsd in tdls config

Tdls uapsd support capability is default disabled during
tdls setup, correspondingly it should also been disabled
in tdls config.

Signed-off-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Zhiyuan Yang <yangzy@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index b71ad4d..fb09014 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -1751,7 +1751,7 @@ mwifiex_cmd_tdls_oper(struct mwifiex_private *priv,
        struct mwifiex_ie_types_vhtcap *vht_capab;
        struct mwifiex_ie_types_aid *aid;
        struct mwifiex_ie_types_tdls_idle_timeout *timeout;
-       u8 *pos, qos_info;
+       u8 *pos;
        u16 config_len = 0;
        struct station_parameters *params = priv->sta_params;
 
@@ -1785,12 +1785,11 @@ mwifiex_cmd_tdls_oper(struct mwifiex_private *priv,
                put_unaligned_le16(params->capability, pos);
                config_len += sizeof(params->capability);
 
-               qos_info = params->uapsd_queues | (params->max_sp << 5);
-               wmm_qos_info = (struct mwifiex_ie_types_qos_info *)(pos +
-                                                                   config_len);
+               wmm_qos_info = (void *)(pos + config_len);
                wmm_qos_info->header.type = cpu_to_le16(WLAN_EID_QOS_CAPA);
-               wmm_qos_info->header.len = cpu_to_le16(sizeof(qos_info));
-               wmm_qos_info->qos_info = qos_info;
+               wmm_qos_info->header.len =
+                               cpu_to_le16(sizeof(wmm_qos_info->qos_info));
+               wmm_qos_info->qos_info = 0;
                config_len += sizeof(struct mwifiex_ie_types_qos_info);
 
                if (params->ht_capa) {