From patchwork Mon Sep 10 05:09:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yeow Yeoh X-Patchwork-Id: 1429831 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 30CBE4025E for ; Mon, 10 Sep 2012 05:12:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751372Ab2IJFMr (ORCPT ); Mon, 10 Sep 2012 01:12:47 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:35239 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751233Ab2IJFMr (ORCPT ); Mon, 10 Sep 2012 01:12:47 -0400 Received: by pbbrr13 with SMTP id rr13so1909340pbb.19 for ; Sun, 09 Sep 2012 22:12:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=nb9C0y8vTYKuCBLugS8xWA+nYSfeyLS4zNUVGaOnHUY=; b=lsdU9n4llGp3jY9c9t9+M+K6IkgScnaAuF8LgAjg1Qb7qU69Y5J+Qh4xz2/HAZU4Dc p1B58BdvR3zxuHH839vJQKksdr1wqfnB/DBQV/helv+vInqHSUPaL0VJ2HtO5rAopaLA aP+uRyFKvRLYMLPzjS+ZjDC0b3kaLwhLjUyzIAYXBalmjDg4ofIaXBg6AgAzYhtljxxo hZadi3SjSJQCZiXpCbt54WwRRfXbP//c/3JEnp6UgAgafa4TUSfRpyVfhremamtdDehW cah+LC0AScPUqqmJBit9uMBX7vI542Y9CE7C9UCZUacF62TNEv9bN1HSFU9dDfYFgBcu r6ew== Received: by 10.68.138.166 with SMTP id qr6mr4144401pbb.69.1347253966919; Sun, 09 Sep 2012 22:12:46 -0700 (PDT) Received: from localhost.localdomain ([58.26.233.146]) by mx.google.com with ESMTPS id qb2sm7501626pbb.15.2012.09.09.22.12.43 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 22:12:46 -0700 (PDT) From: Chun-Yeow Yeoh To: linux-wireless@vger.kernel.org Cc: jirislaby@gmail.com, mickflemm@gmail.com, mcgrof@qca.qualcomm.com, ath5k-devel@lists.ath5k.org, Chun-Yeow Yeoh Subject: [PATCH] ath5k: disable HW crypto in management frame Date: Mon, 10 Sep 2012 13:09:10 +0800 Message-Id: <1347253750-30417-1-git-send-email-yeohchunyeow@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Hardware support for MFP is not available in ath5k. Thus, this implementation allows the mac80211 stack to do the actuall crypto operation. Signed-off-by: Chun-Yeow Yeoh --- drivers/net/wireless/ath/ath5k/base.c | 1 + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index a0a202d..9fd6d9a 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -2446,6 +2446,7 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops) hw->flags = IEEE80211_HW_RX_INCLUDES_FCS | IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | IEEE80211_HW_SIGNAL_DBM | + IEEE80211_HW_MFP_CAPABLE | IEEE80211_HW_REPORTS_TX_ACK_STATUS; hw->wiphy->interface_modes = diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c index df61a09..0f34086 100644 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c @@ -489,6 +489,9 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, if (ath5k_modparam_nohwcrypt) return -EOPNOTSUPP; + if (key->flags & IEEE80211_KEY_FLAG_RX_MGMT) + return -EOPNOTSUPP; + if (vif->type == NL80211_IFTYPE_ADHOC && (key->cipher == WLAN_CIPHER_SUITE_TKIP || key->cipher == WLAN_CIPHER_SUITE_CCMP) &&