From patchwork Tue Sep 19 02:51:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yintang@qti.qualcomm.com X-Patchwork-Id: 9958033 X-Patchwork-Delegate: johannes@sipsolutions.net 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 C3F9B60568 for ; Tue, 19 Sep 2017 02:50:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 930A3289FA for ; Tue, 19 Sep 2017 02:50:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8791A28A05; Tue, 19 Sep 2017 02:50:16 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 3D3A3289FA for ; Tue, 19 Sep 2017 02:50:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751302AbdISCuO (ORCPT ); Mon, 18 Sep 2017 22:50:14 -0400 Received: from alexa-out.qualcomm.com ([129.46.98.28]:63064 "EHLO alexa-out-lv-01.qualcomm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751009AbdISCuM (ORCPT ); Mon, 18 Sep 2017 22:50:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qti.qualcomm.com; i=@qti.qualcomm.com; q=dns/txt; s=qcdkim; t=1505789413; x=1537325413; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=tquXOw4znmLASXVHhwribt5EaqnfmQyVKA05DiRmi74=; b=XLH4Y+YcIP9b0QzS1bztIMmJuj2JMjQ3knuvVrIW5G8j0Cs3NdHRt38R QmbIGOMLePy+UFZCt+mrKFPeypUN0mqkGjqpSb50ykRooxz2/21cCdTrL CgrhFuibdqgYuyCOrZWC0iojG2cHvoeKwvzYMqXVyfwrDIvLs/2tmHfSS g=; X-IronPort-AV: E=Sophos;i="5.42,415,1500966000"; d="scan'208";a="5672191" Received: from ironmsg02-r-new.qualcomm.com (HELO ironmsg02-R.qualcomm.com) ([10.53.140.106]) by alexa-out-lv-01.qualcomm.com with ESMTP; 18 Sep 2017 19:50:13 -0700 X-IronPort-AV: E=McAfee;i="5900,7806,8658"; a="1034638124" X-MGA-submission: =?us-ascii?q?MDHlKQRQ4WFPbR2LEDkrlEIpX+eiXrZPOd0BYK?= =?us-ascii?q?NUUaIxGakApjGwFT8R86N+Of8/crFmP081VDABrnukLyBMPW51jWltnE?= =?us-ascii?q?mzjSaEwFIyUCAdGwWru40QqVyjim94ZCHC+p6S6ffhfFQAXbEI117jsm?= =?us-ascii?q?bs?= Received: from nasanexm03c.na.qualcomm.com ([10.85.0.106]) by ironmsg02-R.qualcomm.com with ESMTP/TLS/AES256-SHA; 18 Sep 2017 19:50:12 -0700 Received: from aptaiexm02b.ap.qualcomm.com (10.249.150.12) by nasanexm03c.na.qualcomm.com (10.85.0.106) with Microsoft SMTP Server (TLS) id 15.0.1293.2; Mon, 18 Sep 2017 19:50:11 -0700 Received: from yintang-HP-EliteBook-1.qca.qualcomm.com (10.80.80.8) by aptaiexm02b.ap.qualcomm.com (10.249.150.12) with Microsoft SMTP Server (TLS) id 15.0.1293.2; Tue, 19 Sep 2017 10:50:07 +0800 From: To: CC: Subject: [TDLS PATCH V2 4/5] ath10k: Avoid to set WEP key for TDLS peer Date: Tue, 19 Sep 2017 10:51:07 +0800 Message-ID: <1505789468-25330-5-git-send-email-yintang@qti.qualcomm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1505789468-25330-1-git-send-email-yintang@qti.qualcomm.com> References: <1505789468-25330-1-git-send-email-yintang@qti.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01B.na.qualcomm.com (10.85.0.82) To aptaiexm02b.ap.qualcomm.com (10.249.150.12) 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: Yingying Tang TDLS peer do not need WEP key. Setting WEP key will lead to TDLS setup failure. Add fix to avoid setting WEP key for TDLS peer. Signed-off-by: Yingying Tang --- drivers/net/wireless/ath/ath10k/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 399f9ba..f6702cb 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -2966,7 +2966,7 @@ static int ath10k_station_assoc(struct ath10k *ar, } /* Plumb cached keys only for static WEP */ - if (arvif->def_wep_key_idx != -1) { + if ((arvif->def_wep_key_idx != -1) && (!sta->tdls)) { ret = ath10k_install_peer_wep_keys(arvif, sta->addr); if (ret) { ath10k_warn(ar, "failed to install peer wep keys for vdev %i: %d\n",