2017-07-21 09:57:44

by Xinming Hu

Subject: [PATCH] mwifiex: disable uapsd in tdls config

From: Xinming Hu <[email protected]>

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

Signed-off-by: Xinming Hu <[email protected]>
Signed-off-by: Cathy Luo <[email protected]>
Signed-off-by: Zhiyuan Yang <[email protected]>
---
drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index 534d94a..eeef69b 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -1755,7 +1755,7 @@ static int mwifiex_cmd_chan_region_cfg(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;

@@ -1789,12 +1789,11 @@ static int mwifiex_cmd_chan_region_cfg(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) {
--
1.9.1

2017-07-28 14:52:04

by Kalle Valo

Subject: Re: mwifiex: disable uapsd in tdls config

Xinming Hu <[email protected]> wrote:

> From: Xinming Hu <[email protected]>
>
> Tdls uapsd support capability is default disabled during
> tdls setup, correspondingly it should also been disabled
> in tdls config.
>
> Signed-off-by: Xinming Hu <[email protected]>
> Signed-off-by: Cathy Luo <[email protected]>
> Signed-off-by: Zhiyuan Yang <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

9e467c52ae4c mwifiex: disable uapsd in tdls config

--
https://patchwork.kernel.org/patch/9856441/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches