From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ew0-f210.google.com ([209.85.219.210]:64563 "EHLO mail-ew0-f210.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755070AbZFRWVy (ORCPT ); Thu, 18 Jun 2009 18:21:54 -0400 Received: by mail-ew0-f210.google.com with SMTP id 6so1987323ewy.37 for ; Thu, 18 Jun 2009 15:21:56 -0700 (PDT) From: David Kilroy To: linux-wireless@vger.kernel.org Cc: orinoco-devel@lists.sourceforge.net, David Kilroy Subject: [PATCH 05/23] cfg80211: infer WPA and WPA2 support from TKIP and CCMP Date: Thu, 18 Jun 2009 23:21:17 +0100 Message-Id: <1245363695-8289-6-git-send-email-kilroyd@googlemail.com> In-Reply-To: <1245363695-8289-1-git-send-email-kilroyd@googlemail.com> References: <1245363695-8289-1-git-send-email-kilroyd@googlemail.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: Signed-off-by: David Kilroy Acked-by: Johannes Berg --- net/wireless/wext-compat.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 2f7e776..cae3b52 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c @@ -201,16 +201,16 @@ int cfg80211_wext_giwrange(struct net_device *dev, range->avg_qual.noise = range->max_qual.noise / 2; range->avg_qual.updated = range->max_qual.updated; - range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2; - for (c = 0; c < wdev->wiphy->n_cipher_suites; c++) { switch (wdev->wiphy->cipher_suites[c]) { case WLAN_CIPHER_SUITE_TKIP: - range->enc_capa |= IW_ENC_CAPA_CIPHER_TKIP; + range->enc_capa |= (IW_ENC_CAPA_CIPHER_TKIP | + IW_ENC_CAPA_WPA); break; case WLAN_CIPHER_SUITE_CCMP: - range->enc_capa |= IW_ENC_CAPA_CIPHER_CCMP; + range->enc_capa |= (IW_ENC_CAPA_CIPHER_CCMP | + IW_ENC_CAPA_WPA2); break; case WLAN_CIPHER_SUITE_WEP40: -- 1.6.0.6