From patchwork Mon Mar 9 13:24:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5967451 Return-Path: X-Original-To: patchwork-ath10k@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 4E315BF440 for ; Mon, 9 Mar 2015 13:27:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7607020254 for ; Mon, 9 Mar 2015 13:27:04 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9A9542024F for ; Mon, 9 Mar 2015 13:27:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YUxhz-00046J-FB; Mon, 09 Mar 2015 13:26:59 +0000 Received: from mail-lb0-x229.google.com ([2a00:1450:4010:c04::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YUxhw-0003th-HF for ath10k@lists.infradead.org; Mon, 09 Mar 2015 13:26:57 +0000 Received: by lbiz12 with SMTP id z12so48172836lbi.5 for ; Mon, 09 Mar 2015 06:26:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=xoPvWKIcDz5K6lbT5TXs4rGII/qY4GPVhFrN7d5zZMI=; b=X1pAmJtmEoNhbc6YN5QcsouxL7+OQTHUXT73qUutTml7UJQ//kGznyh2GPi2N76+Zi RVUxgkSu+Lhk3surD+/HQzqh13qShH6ChCUWfkV+9qpfSW5BEw8ViD3ZQfxmoMGFQYHZ 6kJkj6hpgRByoI5YBKuxw22nBL8UYoilis6is= 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; bh=xoPvWKIcDz5K6lbT5TXs4rGII/qY4GPVhFrN7d5zZMI=; b=WigPCNtiBq7e7gx3UWMTA/WI00lIH7vRp5I4Rv5LEjSVUp+RQdujZnhGT0SRlqYCCV 5SQbkLDFuV8idJ4kXWZ9oIG9LIiGrhzPnMOyM0SmzA1dMC+Mw15ACGP6CG8ZESSl89wG s71ZN0aj1/+TdatjXsHowl835xvmnMCDhsc+u7Ni41nYQ+OowqOKneEQ6p8q3XZXiVAx PC7Y56BzwmNnHL6yoMIiqGhyIZrhaeQ9MN0gC3rx7v9Ok3+Ia2d+J3hts/+N6Rme3xWm 2GcB2AY+On36xpiH8Amd6BBdiPeDKzo8MbIb8SnCNAvPfk1ZrDSdCkiEHk5qN3Dr28Q8 1E+w== X-Gm-Message-State: ALoCoQm6jos6tTjleTe1HHp1veHyt1giC6dL/T4mK+Vu1fbNuSkX3g6DQZGlKZDsBvT+vyBt8Z0xoXLcNpnh7f169Dw76rgBmlvm7r1ZcJIPrj4c5hvuvK6NSGkW9daHkg+nW0nmFxBThX4nfdSkHJRn8QiW7TOSDr9CF3jpUrdNJ8NxcWHB8Rw= X-Received: by 10.112.140.38 with SMTP id rd6mr25477108lbb.116.1425907593446; Mon, 09 Mar 2015 06:26:33 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id rz10sm100197lbb.46.2015.03.09.06.26.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Mar 2015 06:26:32 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Subject: [PATCH] ath10k: fix WPA crypto Date: Mon, 9 Mar 2015 14:24:17 +0100 Message-Id: <1425907457-15118-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150309_062656_748784_1241C3D1 X-CRM114-Status: GOOD ( 10.48 ) X-Spam-Score: -0.8 (/) Cc: linux-wireless@vger.kernel.org, Michal Kazior X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 My recent patch `ath10k: fix broken traffic for 802.1x in client mode` introduced a regression on WPA crypto. All keys were treated as if they were WEP which resulted in WPA being incorrectly installed to fw/hw and subsequently no traffic. Reported-by: Marek Puzyniak Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 1138f4f..d65a146 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -4028,6 +4028,11 @@ static int ath10k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, } } + if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE) + flags |= WMI_KEY_PAIRWISE; + else + flags |= WMI_KEY_GROUP; + if (is_wep) { if (cmd == SET_KEY) arvif->wep_keys[key->keyidx] = key; @@ -4053,29 +4058,24 @@ static int ath10k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, */ if (cmd == SET_KEY && arvif->def_wep_key_idx == -1) flags |= WMI_KEY_TX_USAGE; - } - if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE) - flags |= WMI_KEY_PAIRWISE; - else - flags |= WMI_KEY_GROUP; - - /* mac80211 uploads static WEP keys as groupwise while fw/hw requires - * pairwise keys for non-self peers, i.e. BSSID in STA mode and - * associated stations in AP/IBSS. - * - * Static WEP keys for peer_addr=vif->addr and 802.1X WEP keys work - * fine when mapped directly from mac80211. - * - * Note: When installing first static WEP groupwise key (which should - * be pairwise) def_wep_key_idx isn't known yet (it's equal to -1). - * Since .set_default_unicast_key is called only for static WEP it's - * used to re-upload the key as pairwise. - */ - if (arvif->def_wep_key_idx >= 0 && - memcmp(peer_addr, arvif->vif->addr, ETH_ALEN)) { - flags &= ~WMI_KEY_GROUP; - flags |= WMI_KEY_PAIRWISE; + /* mac80211 uploads static WEP keys as groupwise while fw/hw + * requires pairwise keys for non-self peers, i.e. BSSID in STA + * mode and associated stations in AP/IBSS. + * + * Static WEP keys for peer_addr=vif->addr and 802.1X WEP keys + * work fine when mapped directly from mac80211. + * + * Note: When installing first static WEP groupwise key (which + * should be pairwise) def_wep_key_idx isn't known yet (it's + * equal to -1). Since .set_default_unicast_key is called only + * for static WEP it's used to re-upload the key as pairwise. + */ + if (arvif->def_wep_key_idx >= 0 && + memcmp(peer_addr, arvif->vif->addr, ETH_ALEN)) { + flags &= ~WMI_KEY_GROUP; + flags |= WMI_KEY_PAIRWISE; + } } ret = ath10k_install_key(arvif, key, cmd, peer_addr, flags);