From patchwork Tue Apr 19 05:00:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 8876741 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 08471BF29F for ; Tue, 19 Apr 2016 05:04:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3E3E82015A for ; Tue, 19 Apr 2016 05:04:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BE2720260 for ; Tue, 19 Apr 2016 05:04:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752754AbcDSFEI (ORCPT ); Tue, 19 Apr 2016 01:04:08 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:34306 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752345AbcDSFBO (ORCPT ); Tue, 19 Apr 2016 01:01:14 -0400 Received: by mail-pf0-f175.google.com with SMTP id c20so2738065pfc.1 for ; Mon, 18 Apr 2016 22:01:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hqA+WKglXT46Yr/dDJag5RHQU0xsFpT0zzhPYTiHQgg=; b=d373vjNgLM9YqWdsY+rKriRPLPfXsjb12KQnEUfpCd02NcusqN6pMUfDHkpH50WgJh GVf6iGNxNn+MsLo8hkd6JWvWrLixXZqBkl3jspuG5MZioJ7tx1JKN+yJudWLz/QxL16t xSaak2Aws3LUD1qKXnc1k6cqdOJscO6gNjXXQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hqA+WKglXT46Yr/dDJag5RHQU0xsFpT0zzhPYTiHQgg=; b=HHMvsrCscr8Hg6iWona4VwXb36AfJtlr+9wmWG8yatxJJ2JKj+dfMRuP5cSFHm7O+h 6iTeVwmzIZkFCmnKNkEc29t+/N81vWkRGH04garUojFoKyxsvZFKHaOIS6bibyg1NHn0 LNncSSVeCuZF8Z7w4GXEh1/yvWFRPOy+kUOQVETK87XM4GBQAa2hNrYyy45uyBWBYcuY crTjGg8h9VrpAw6qiQuQwPt3VRbVDHO+O08Ry2SShDSdKpbToItLoknBPXOqrpbvS7aK 39QQgYwW4jXoUX5du9uo7iHcOmxlzrqrC48iXcRDao0PAwLR17B1UJEnHVmzJREpFzmH FZ0Q== X-Gm-Message-State: AOPr4FU4G2Dto4CQH6OjdSmeZTlIalzwHPta3NTUcf5rfugxOOK2y24k39fO6oB8qsIrPAv/ X-Received: by 10.98.44.72 with SMTP id s69mr1318413pfs.31.1461042073304; Mon, 18 Apr 2016 22:01:13 -0700 (PDT) Received: from localhost.localdomain (ip68-111-223-48.sd.sd.cox.net. [68.111.223.48]) by smtp.gmail.com with ESMTPSA id kh2sm20274686pad.9.2016.04.18.22.01.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Apr 2016 22:01:12 -0700 (PDT) From: Bjorn Andersson To: Eugene Krasnikov , Kalle Valo Cc: Pontus Fuchs , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 12/18] wcn36xx: Clear encrypt_type when deleting bss key Date: Mon, 18 Apr 2016 22:00:50 -0700 Message-Id: <1461042056-10607-13-git-send-email-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461042056-10607-1-git-send-email-bjorn.andersson@linaro.org> References: <1461042056-10607-1-git-send-email-bjorn.andersson@linaro.org> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Pontus Fuchs This fixes a problem connecting to an open network after being connected to an encrypted network. Signed-off-by: Pontus Fuchs Signed-off-by: Bjorn Andersson --- drivers/net/wireless/ath/wcn36xx/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c index 7c06ca9fdd2c..f9c77de94583 100644 --- a/drivers/net/wireless/ath/wcn36xx/main.c +++ b/drivers/net/wireless/ath/wcn36xx/main.c @@ -471,6 +471,7 @@ static int wcn36xx_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, break; case DISABLE_KEY: if (!(IEEE80211_KEY_FLAG_PAIRWISE & key_conf->flags)) { + vif_priv->encrypt_type = WCN36XX_HAL_ED_NONE; wcn36xx_smd_remove_bsskey(wcn, vif_priv->encrypt_type, key_conf->keyidx); @@ -626,6 +627,7 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw, } else { vif_priv->is_joining = false; wcn36xx_smd_delete_bss(wcn, vif); + vif_priv->encrypt_type = WCN36XX_HAL_ED_NONE; } }