From patchwork Fri Jul 21 09:57:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinming Hu X-Patchwork-Id: 9856441 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7529860392 for ; Fri, 21 Jul 2017 09:57:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 545AF2877C for ; Fri, 21 Jul 2017 09:57:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 48EF928781; Fri, 21 Jul 2017 09:57:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B58D82877C for ; Fri, 21 Jul 2017 09:57:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932150AbdGUJ5q (ORCPT ); Fri, 21 Jul 2017 05:57:46 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36436 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932067AbdGUJ5o (ORCPT ); Fri, 21 Jul 2017 05:57:44 -0400 Received: by mail-pf0-f196.google.com with SMTP id a11so4491061pfj.3 for ; Fri, 21 Jul 2017 02:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=NAZg3hshzI7rFXe+mSMkY6HlCkvy5F5AcDarEplOkSk=; b=XpBpJ7VeuPV9jLz5p7iAwDEXSKsNN9hGFLh9dKTmlyeEbHEM01kr/kEB3NU0o83V6v hasE8a+ZCPkKkP/bJaoJKmBzKhvMniaaB8M9S7buq7tBS/K20Yj69nh3n9RoTpbs3rYT VBGldRAouUVr6u6pE0nm0+xhrbPagInUXex0bYZEusVsr9nuFGCpxbrnrTHWA48KMAir cM3Dy/2Svq9csUq36nmEweM5tJs6rd/PUeQg7B5CARYLyp2hcfxwOWvWshLlk8WEWz8X CfJqXPNz512KwiH3DIO+93+XoZnGONoeAcrrrEK8rDD838Feaz3U+IE1VfMABZCvHZ8g +seg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NAZg3hshzI7rFXe+mSMkY6HlCkvy5F5AcDarEplOkSk=; b=k2GCYzf+VkaeI+xjchVDadHU8I5OlhFdB/zMlC3RGr5pn9TbMGmYGs5br3xSz3HinS wC03dXg5Ff9HP85Cj7+9vjzdN/Z6nLhRa8dKuatkj13A6T61d/YdR9kgRSxGs1WbeYP/ 6VN1qZQDth1RM9EXjlxMqwhlX5K1CZtvUyrOfnwGK4vvrF6hkgCRcw/lYH+AkDnQpBjK 5YQlV2uu7UUP/QxyCdzr8VcIapOVKQS4Lu4W+5UNMF98EItYI4d8S0CCxVJhMZKYwHNE lixMxtDyZBDaaDfwTVVyqYvBAMxXAJLvj/1vfaVRrljwztc/44CvHB3QSfFpa98hj6tH acjA== X-Gm-Message-State: AIVw110vixwap17CWnkzdlE7FEVgMGYhXEYSAu7pk+wXE6cySBCWY+WP RCeHF8IGZUi/Xah7 X-Received: by 10.84.232.5 with SMTP id h5mr7465086plk.363.1500631063319; Fri, 21 Jul 2017 02:57:43 -0700 (PDT) Received: from ubuntu.members.linode.com ([2400:8902::f03c:91ff:fee7:7cf1]) by smtp.gmail.com with ESMTPSA id 133sm10129400pgc.19.2017.07.21.02.57.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Jul 2017 02:57:42 -0700 (PDT) From: Xinming Hu To: Linux Wireless Cc: Kalle Valo , Brian Norris , Dmitry Torokhov , rajatja@google.com, Zhiyuan Yang , Tim Song , Cathy Luo , Ganapathi Bhat , Xinming Hu Subject: [PATCH] mwifiex: disable uapsd in tdls config Date: Fri, 21 Jul 2017 09:57:37 +0000 Message-Id: <1500631057-32395-1-git-send-email-huxinming820@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Xinming Hu Tdls uapsd support capability is default disabled during tdls setup, correspondingly it should also been disabled in tdls config. Signed-off-by: Xinming Hu Signed-off-by: Cathy Luo Signed-off-by: Zhiyuan Yang --- 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) {