From patchwork Tue Oct 10 08:02:30 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: 9995255 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 15117603B5 for ; Tue, 10 Oct 2017 08:00:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 065A1280FC for ; Tue, 10 Oct 2017 08:00:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF30B28112; Tue, 10 Oct 2017 08:00:55 +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 927F4280FC for ; Tue, 10 Oct 2017 08:00:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755815AbdJJIAy (ORCPT ); Tue, 10 Oct 2017 04:00:54 -0400 Received: from sabertooth01.qualcomm.com ([65.197.215.72]:32743 "EHLO sabertooth01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755538AbdJJIAx (ORCPT ); Tue, 10 Oct 2017 04:00:53 -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=1507622453; x=1539158453; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=tquXOw4znmLASXVHhwribt5EaqnfmQyVKA05DiRmi74=; b=caHGyJboSsluX06i1FOiVff729ug4JwxGPEUDKeJShe3NSQjQUs8hoj1 N1jP8fj4pDA1DzbglHKj6mGPTaLehsukwY/N6Id6jsNSuZVbU6W7c3J+C 5V1c2MLlraUb+L4F64TY7NS4HYaUU5S6n6k6DXNcgHe/x9xmgHuMGgKYD o=; X-IronPort-AV: E=Sophos;i="5.42,503,1500966000"; d="scan'208";a="115661729" Received: from unknown (HELO Ironmsg04-R.qualcomm.com) ([10.53.140.108]) by sabertooth01.qualcomm.com with ESMTP; 10 Oct 2017 01:00:53 -0700 X-IronPort-AV: E=McAfee;i="5900,7806,8679"; a="1509076707" X-MGA-submission: =?us-ascii?q?MDF+6MNVVK64XmkBpySp4LKm4ezDSjK8aPZ/z+?= =?us-ascii?q?sZSDlIafLW6gwwdrwfzg4vV+/aWbfWxTmFcPeYC8/cuBzGM4LJKGN5nY?= =?us-ascii?q?QeFczy0SanA8TK4gRNRxqFi9mDQFV5hbXVkhOLvMW6+2KV4PFX/E1lyL?= =?us-ascii?q?53?= Received: from nasanexm03g.na.qualcomm.com ([10.85.0.49]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/AES256-SHA; 10 Oct 2017 01:00:52 -0700 Received: from aptaiexm02b.ap.qualcomm.com (10.249.150.12) by nasanexm03g.na.qualcomm.com (10.85.0.49) with Microsoft SMTP Server (TLS) id 15.0.1293.2; Tue, 10 Oct 2017 01:00:51 -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:00:47 +0800 From: To: CC: Subject: [PATCH 4/5] ath10k: Avoid to set WEP key for TDLS peer Date: Tue, 10 Oct 2017 16:02:30 +0800 Message-ID: <1507622551-9156-2-git-send-email-yintang@qti.qualcomm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1507622551-9156-1-git-send-email-yintang@qti.qualcomm.com> References: <1507622551-9156-1-git-send-email-yintang@qti.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01F.na.qualcomm.com (10.85.0.32) 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",