From patchwork Fri Oct 16 05:18:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yi X-Patchwork-Id: 54162 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9G5RE7A003856 for ; Fri, 16 Oct 2009 05:27:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752497AbZJPFUj (ORCPT ); Fri, 16 Oct 2009 01:20:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752493AbZJPFUi (ORCPT ); Fri, 16 Oct 2009 01:20:38 -0400 Received: from mga01.intel.com ([192.55.52.88]:40823 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752125AbZJPFUi (ORCPT ); Fri, 16 Oct 2009 01:20:38 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 15 Oct 2009 22:13:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,570,1249282800"; d="scan'208";a="736961956" Received: from debian.sh.intel.com (HELO localhost.localdomain) ([10.239.13.180]) by fmsmga001.fm.intel.com with ESMTP; 15 Oct 2009 22:22:00 -0700 From: Zhu Yi To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Samuel Ortiz , Zhu Yi Subject: [PATCH 05/16] iwmc3200wifi: Profile flags can be WPA1 or WPA2 not both Date: Fri, 16 Oct 2009 13:18:49 +0800 Message-Id: <1255670340-22565-6-git-send-email-yi.zhu@intel.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1255670340-22565-5-git-send-email-yi.zhu@intel.com> References: <1255670340-22565-1-git-send-email-yi.zhu@intel.com> <1255670340-22565-2-git-send-email-yi.zhu@intel.com> <1255670340-22565-3-git-send-email-yi.zhu@intel.com> <1255670340-22565-4-git-send-email-yi.zhu@intel.com> <1255670340-22565-5-git-send-email-yi.zhu@intel.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c index a6d2f20..ea0ed32 100644 --- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c +++ b/drivers/net/wireless/iwmc3200wifi/cfg80211.c @@ -472,12 +472,12 @@ static int iwm_set_wpa_version(struct iwm_priv *iwm, u32 wpa_version) return 0; } + if (wpa_version & NL80211_WPA_VERSION_1) + iwm->umac_profile->sec.flags = UMAC_SEC_FLG_WPA_ON_MSK; + if (wpa_version & NL80211_WPA_VERSION_2) iwm->umac_profile->sec.flags = UMAC_SEC_FLG_RSNA_ON_MSK; - if (wpa_version & NL80211_WPA_VERSION_1) - iwm->umac_profile->sec.flags |= UMAC_SEC_FLG_WPA_ON_MSK; - return 0; }