From patchwork Sun Feb 14 23:32:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit PAPILLAULT X-Patchwork-Id: 79332 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1ENWeDf030200 for ; Sun, 14 Feb 2010 23:32:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753196Ab0BNXci (ORCPT ); Sun, 14 Feb 2010 18:32:38 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:39947 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752839Ab0BNXch (ORCPT ); Sun, 14 Feb 2010 18:32:37 -0500 Received: from smtp1-g21.free.fr (localhost [127.0.0.1]) by smtp1-g21.free.fr (Postfix) with ESMTP id 05BE49400E5; Mon, 15 Feb 2010 00:32:29 +0100 (CET) Received: from xian.sabine-et-benoit.com (ns.popipo.fr [88.163.232.53]) by smtp1-g21.free.fr (Postfix) with ESMTP id 1B13E9400C2; Mon, 15 Feb 2010 00:32:27 +0100 (CET) Received: by xian.sabine-et-benoit.com (Postfix, from userid 1000) id B4FC3701A3; Mon, 15 Feb 2010 00:32:26 +0100 (CET) From: Benoit Papillault To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Benoit Papillault Subject: [PATCH 2/2] mac80211: Fix WPA-NONE for RX unicast frames Date: Mon, 15 Feb 2010 00:32:26 +0100 Message-Id: <1266190346-2247-2-git-send-email-benoit.papillault@free.fr> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1266190346-2247-1-git-send-email-benoit.papillault@free.fr> References: <1266190346-2247-1-git-send-email-benoit.papillault@free.fr> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 14 Feb 2010 23:32:40 +0000 (UTC) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 22ae6ee..f73fe9b 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -923,6 +923,13 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) rx->key = rcu_dereference(rx->sdata->keys[keyidx]); /* + * Using WPA-NONE in IBSS, all frames, be it unicast or + * multicast (including broadcast) are encrypted with the + * same group key. In this case, we should not reset the key + * to NULL + */ +#if 0 + /* * RSNA-protected unicast frames should always be sent with * pairwise or station-to-station keys, but for WEP we allow * using a key index as well. @@ -930,6 +937,7 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) if (rx->key && rx->key->conf.alg != ALG_WEP && !is_multicast_ether_addr(hdr->addr1)) rx->key = NULL; +#endif } if (rx->key) {