From patchwork Tue Oct 10 08:11:19 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: 9995273 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 D38B260230 for ; Tue, 10 Oct 2017 08:10:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4C9628113 for ; Tue, 10 Oct 2017 08:10:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B991528174; Tue, 10 Oct 2017 08:10:21 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5D02A28113 for ; Tue, 10 Oct 2017 08:10:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ozqTs2riBnzsq9Ox+JnsskczYXTsGB8jLr/nMo2DoKo=; b=hhuPSw/w/JEdJo tK7sCDgtanjhekOIdWCIaNwhNa9IhCApEiI/N3lmXTa4WtSXwyeyId9YzsW9rkofcCzdO2rmXBGJ4 3aAD08dzFw+D9iIXx/o1eI1sF6q64Sa+IcgxltuNrkX3IbldGS5R12ZFMnZZNhimdH6f68MfCb2h7 pOUWKMpzrXrWGRWew9tUOGzhQbGdDwmu4YayODLAKhnYlPw5ADndLK9NtPdrSV/Dz7WCypwiGh+0n Lou8e1cASpU3m2bzN5zzrxnCxaz+x9iF0KmSEsyyh3CEBHR8lYMwm1R1+jEiv//F/cXtHJwdNStSf CojViYC+LoS50KbkjOfg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e1pcG-0004vG-Qn; Tue, 10 Oct 2017 08:10:16 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e1pcC-0004WV-54 for ath10k@bombadil.infradead.org; Tue, 10 Oct 2017 08:10:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=N1ahpXYRfM/C/ybk1saQsV2EluXd27pfejkDwKaizoM=; b=ZjcEnkONgmg2p0mCSbKjuqpFm 88J+evJ0TLcmS+1+RX3GU1mGWcYTV4rzLmD+rsbcJmQ/VbTwcZJqfcPVCdnsg8H5JNZGmGC6zPiaW bZrbvwk48rIfXiNsOAhOIN5L0AqhMUNnUrabbs1QX/8s+FX9mv1NgX2Ww5fvheVHcp1fH4DYWG5RT m1NwceY9864igvfTpmgFEZJ2AVPGTLR6TRPsJdJRkodwcK5jgrplCNOC0lF9AG+wnEoSKMOJkjLlS 9gefP0lbWs9LVIoR4FU47ROM7/hMVMkor+od+kfekcj9NDTbbho0rPFAJgMuL6+i/JH13x8idtbAk lqGU924oA==; Received: from alexa-out.qualcomm.com ([129.46.98.28]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e1pc4-0002b3-LG for ath10k@lists.infradead.org; Tue, 10 Oct 2017 08:10:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qti.qualcomm.com; i=@qti.qualcomm.com; q=dns/txt; s=qcdkim; t=1507623005; x=1539159005; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=tquXOw4znmLASXVHhwribt5EaqnfmQyVKA05DiRmi74=; b=W0LT1AgkQKwS2VUaGIp/rb+L3bGBAyqkktHBMNKL6YYaBwPYn7N/PbeZ qSmVLFjzrBPaV+xMxlHEoILrpALqGQPF9AwiqlO1WIi3gQvAJRWRhHZi9 5BSdUUCqzecMrY/JWXVUw8GsmVClCxrLLszt/7p7ZJnZB4hFNTrvkP3sZ Q=; X-IronPort-AV: E=Sophos;i="5.42,503,1500966000"; d="scan'208";a="6209266" Received: from ironmsg04-r-new.qualcomm.com (HELO Ironmsg04-R.qualcomm.com) ([10.53.140.108]) by alexa-out.qualcomm.com with ESMTP; 10 Oct 2017 01:09:42 -0700 X-IronPort-AV: E=McAfee;i="5900,7806,8679"; a="1509082066" X-MGA-submission: =?us-ascii?q?MDHLKgT+deYUvfMvUiEqRfSmgUMJKgGTXJsrQt?= =?us-ascii?q?sAp2rhy07SAYXs/Fv7QXPHW/nGkD4iSgj0pYwOziZHpkF7qOWMU6o8U/?= =?us-ascii?q?hbKZ/T3X6fYyGsop0sIaXpq3fJpICUQ5szEznm1UUTwMsgW4VbmgqYrk?= =?us-ascii?q?MV?= Received: from nasanexm03c.na.qualcomm.com ([10.85.0.106]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/AES256-SHA; 10 Oct 2017 01:09:42 -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; Tue, 10 Oct 2017 01:09:41 -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, 10 Oct 2017 16:09:37 +0800 From: To: Subject: [PATCH V5 4/5] ath10k: Avoid to set WEP key for TDLS peer Date: Tue, 10 Oct 2017 16:11:19 +0800 Message-ID: <1507623080-9311-5-git-send-email-yintang@qti.qualcomm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1507623080-9311-1-git-send-email-yintang@qti.qualcomm.com> References: <1507623080-9311-1-git-send-email-yintang@qti.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01E.na.qualcomm.com (10.85.0.31) To aptaiexm02b.ap.qualcomm.com (10.249.150.12) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.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",