From patchwork Mon Oct 16 06:00:32 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: 10007705 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 9522160235 for ; Mon, 16 Oct 2017 05:59:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86CCB27CAF for ; Mon, 16 Oct 2017 05:59:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7BCA127D4D; Mon, 16 Oct 2017 05:59:17 +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 41B0127CAF for ; Mon, 16 Oct 2017 05:59:17 +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=uLQ1iURHl5WB/hXEyi2Eq/3VH2uAFETp0XBdyMPPp+0=; b=qXLh4yeeFWXFT9 wbblDnbPzij9n0kegPL2/DhrTUTJiV6TlIs0cMMr8XUtKnroCp+DkbjRuVZI6+baGDgF7Jk2lMJib 06Wb91+TyTvrTg8NHzRi3XRvYMnYZNQJYHdAn/GMTMNBt0DvNNI81rYJw7MzA20NdkfGqrhP2sg03 +7BDZX9S2UqjZJgGBsUhGKbeglM0qHdt/bIFCm+AlUqrgcWJASXpMV4ClVZ5ZVvWjJYb3zYvx5Oy7 kaFaVY3qB2TTWfyXdx1mSzv+9czVWRQDcEyJP4nzDbVxjP+vPdp3snX3xR8D8yGsSXTyZyLIZocGY fkMnP/DqQ+Ns1+7Q4HwQ==; 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 1e3yQg-0006zf-7f; Mon, 16 Oct 2017 05:59:10 +0000 Received: from alexa-out.qualcomm.com ([129.46.98.28]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e3yQZ-0006o1-08 for ath10k@lists.infradead.org; Mon, 16 Oct 2017 05:59:07 +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=1508133543; x=1539669543; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=XGrb9WHE1rnfJTXtKquvopKn2UA7pPswfKGf3AYWCDg=; b=CPKehJDh1HtmrdgIQ7bXwwrmUFv3b4s15LaNwP1PLVi3K1a+YSoG6gIj 2XsrlCiXNqnTurxnJMBPleyzvV79e0jQefi/GfVqQ5bbPd0Myat6ZPcsY tfIprjoZ/cIVWrm+DkAOJnxoJFasIdNyZ1u2iGw64xedabmMoqgFtkaeB Y=; X-IronPort-AV: E=Sophos;i="5.43,385,1503385200"; d="scan'208";a="6372579" Received: from ironmsg04-l-new.qualcomm.com (HELO Ironmsg04-L.qualcomm.com) ([10.53.140.111]) by alexa-out.qualcomm.com with ESMTP; 15 Oct 2017 22:58:46 -0700 X-IronPort-AV: E=McAfee;i="5900,7806,8685"; a="1444069439" X-MGA-submission: =?us-ascii?q?MDFZ2F/OD/Cu6sKf1eEWu6wGA/bMalYEYwLlvA?= =?us-ascii?q?zaHqcb4RDeIkQLkfm9oZD7NThdBn5fbek7K0cOFdRtzH06APBMJgesq7?= =?us-ascii?q?r39OjEMw4rTAJYvaoME4W8AdIyvLQuaORNniq7wWtswKozy8YLg87gM7?= =?us-ascii?q?Sx?= Received: from nasanexm03e.na.qualcomm.com ([10.85.0.48]) by Ironmsg04-L.qualcomm.com with ESMTP/TLS/AES256-SHA; 15 Oct 2017 22:58:45 -0700 Received: from aptaiexm02b.ap.qualcomm.com (10.249.150.12) by nasanexm03e.na.qualcomm.com (10.85.0.48) with Microsoft SMTP Server (TLS) id 15.0.1293.2; Sun, 15 Oct 2017 22:58:45 -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; Mon, 16 Oct 2017 13:58:39 +0800 From: To: Subject: [PATCH V6 4/5] ath10k: Avoid to set WEP key for TDLS peer Date: Mon, 16 Oct 2017 14:00:32 +0800 Message-ID: <1508133633-23214-5-git-send-email-yintang@qti.qualcomm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1508133633-23214-1-git-send-email-yintang@qti.qualcomm.com> References: <1508133633-23214-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) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171015_225903_602082_5AA9C14B X-CRM114-Status: UNSURE ( 7.67 ) X-CRM114-Notice: Please train this message. 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 1672043..a984a72 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",