From patchwork Wed Feb 18 13:02:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5843961 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 139ABBF6C3 for ; Wed, 18 Feb 2015 13:14:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 39BC92021F for ; Wed, 18 Feb 2015 13:14:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5BB832025A for ; Wed, 18 Feb 2015 13:14:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751983AbbBRNOZ (ORCPT ); Wed, 18 Feb 2015 08:14:25 -0500 Received: from mail-wi0-f170.google.com ([209.85.212.170]:51116 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751793AbbBRNOX (ORCPT ); Wed, 18 Feb 2015 08:14:23 -0500 Received: by mail-wi0-f170.google.com with SMTP id hi2so38866164wib.1 for ; Wed, 18 Feb 2015 05:14:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L6mCLcCQfjc3BQNqGNO+5PFJ+ngnWyD/kNd/zMuS66g=; b=O0zJ/XYJYSD39tn+6hn4F54o19Eeuva8P6XhPmSy8sKUqrf7nwCE8wkCPl23RHM6EZ XImc2RuV8mEWkXURZVU1JfZKHHtPwyc9oF/VrIbpIwlEN2TzwojHvHNgCLDTEZwcxilt ZJkq0oz20TSxN9zdSR5/j2kcKyxaH5y2fcRP0= 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=L6mCLcCQfjc3BQNqGNO+5PFJ+ngnWyD/kNd/zMuS66g=; b=elZ6tGEOmN0OWnjGSH/kZO1QlMG4XzgJwr+/l3XKmhIEB7k5Iw9I/0JwyWSqVp0iRn DxRtvLFmwL05u01TrSdNO8P09q+tWLpF9ksjgQmSfn6hR4YEa+RZe8/MIb0PaoyRzf2a hfcPwopDUdQeDtCOQC3CKOojq1sl0EvsrtaKkdYJGULF+fHxLguogxxC3QfvR/jErytf nk6LUYACHWzIvRv7jtTgI4lA8zDfMv44AhsZxYNth+Z0KLryhnlXwYmpBcDU0Iw1t+Eh WEd5cUaoCRWzm7rEn6gfbiYqqIsFlwObfQEfDJBlSZSYQBbaFUTn0Y8jmh6Co3AMb7kd jMFQ== X-Gm-Message-State: ALoCoQkov00kRP6ca27xSScZrnXyb/wfqvm0H+UJwI7/l7OtE7de+GHAJuI6R5333nGIHtmzkhqZkv+QGIzV8zEjWI5qI2aJOk8Rz/M1yH4lQfVSyvsYPlpYkSENDLUmYZPB02YLvaVF X-Received: by 10.180.98.5 with SMTP id ee5mr4912993wib.11.1424265262436; Wed, 18 Feb 2015 05:14:22 -0800 (PST) Received: from bob.homerouter.cpe (apn-31-1-134-151.dynamic.gprs.plus.pl. [31.1.134.151]) by mx.google.com with ESMTPSA id qb8sm26519494wjc.4.2015.02.18.05.14.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Feb 2015 05:14:21 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH 2/2] ath10k: fix broken traffic for static WEP in IBSS Date: Wed, 18 Feb 2015 14:02:27 +0100 Message-Id: <1424264547-2932-2-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1424264547-2932-1-git-send-email-michal.kazior@tieto.com> References: <1424264547-2932-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 When WEP keys are uploaded it's possible that there are stations associated already (e.g. when merging) without any keys. Static WEP needs an explicit per-peer key upload. Make sure to re-upload wep keys if necessary. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 41 +++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 733c79d..e7e7d92 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -297,6 +297,39 @@ static int ath10k_mac_vif_sta_fix_wep_key(struct ath10k_vif *arvif) return 0; } +static int ath10k_mac_vif_update_wep_key(struct ath10k_vif *arvif, + struct ieee80211_key_conf *key) +{ + struct ath10k *ar = arvif->ar; + struct ath10k_peer *peer; + int ret; + + lockdep_assert_held(&ar->conf_mutex); + + list_for_each_entry(peer, &ar->peers, list) { + if (!memcmp(peer->addr, arvif->vif->addr, ETH_ALEN)) + continue; + + if (!memcmp(peer->addr, arvif->bssid, ETH_ALEN)) + continue; + + if (peer->keys[key->keyidx] == key) + continue; + + ath10k_dbg(ar, ATH10K_DBG_MAC, "mac vif vdev %i update key %i needs update\n", + arvif->vdev_id, key->keyidx); + + ret = ath10k_install_peer_wep_keys(arvif, peer->addr); + if (ret) { + ath10k_warn(ar, "failed to update wep keys on vdev %i for peer %pM: %d\n", + arvif->vdev_id, peer->addr, ret); + return ret; + } + } + + return 0; +} + /*********************/ /* General utilities */ /*********************/ @@ -3862,6 +3895,14 @@ static int ath10k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, if (cmd == DISABLE_KEY) ath10k_clear_vdev_key(arvif, key); + /* When WEP keys are uploaded it's possible that there are + * stations associated already (e.g. when merging) without any + * keys. Static WEP needs an explicit per-peer key upload. + */ + if (vif->type == NL80211_IFTYPE_ADHOC && + cmd == SET_KEY) + ath10k_mac_vif_update_wep_key(arvif, key); + /* 802.1x never sets the def_wep_key_idx so each set_key() * call changes default tx key. *