public inbox for linux-wireless@vger.kernel.org
 help / color / mirror / Atom feed
From: Zhu Yi <yi.zhu@intel.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org, Zhu Yi <yi.zhu@intel.com>
Subject: [PATCH 03/10] iwmc3200wifi: set cipher_suites before registering wiphy
Date: Thu, 16 Jul 2009 17:34:08 +0800	[thread overview]
Message-ID: <1247736854-6760-4-git-send-email-yi.zhu@intel.com> (raw)
In-Reply-To: <1247736854-6760-3-git-send-email-yi.zhu@intel.com>

We need to specify all the cipher suites we supported. Otherwise
cfg80211_validate_key_settings() will fail when we are setting
keys.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
 drivers/net/wireless/iwmc3200wifi/cfg80211.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
index 54bebba..0aa3895 100644
--- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c
+++ b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
@@ -558,6 +558,13 @@ static struct cfg80211_ops iwm_cfg80211_ops = {
 	.set_power_mgmt = iwm_cfg80211_set_power_mgmt,
 };
 
+static const u32 cipher_suites[] = {
+	WLAN_CIPHER_SUITE_WEP40,
+	WLAN_CIPHER_SUITE_WEP104,
+	WLAN_CIPHER_SUITE_TKIP,
+	WLAN_CIPHER_SUITE_CCMP,
+};
+
 struct wireless_dev *iwm_wdev_alloc(int sizeof_bus, struct device *dev)
 {
 	int ret = 0;
@@ -600,6 +607,9 @@ struct wireless_dev *iwm_wdev_alloc(int sizeof_bus, struct device *dev)
 	wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &iwm_band_5ghz;
 	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
 
+	wdev->wiphy->cipher_suites = cipher_suites;
+	wdev->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
+
 	ret = wiphy_register(wdev->wiphy);
 	if (ret < 0) {
 		dev_err(dev, "Couldn't register wiphy device\n");
-- 
1.6.0.4


  reply	other threads:[~2009-07-16  9:33 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-16  9:34 [PATCH 00/09] iwmc3200wifi updates Zhu Yi
2009-07-16  9:34 ` [PATCH 01/10] iwmc3200wifi: fix UMAC INIT_COMPLETE notification handling Zhu Yi
2009-07-16  9:34   ` [PATCH 02/10] iwmc3200wifi: hardware does not support IP checksum Zhu Yi
2009-07-16  9:34     ` Zhu Yi [this message]
2009-07-16  9:34       ` [PATCH 04/10] iwmc3200wifi: use correct debug level Zhu Yi
2009-07-16  9:34         ` [PATCH 05/10] iwmc3200wifi: cfg80211 managed mode port Zhu Yi
2009-07-16  9:34           ` [PATCH 06/10] iwmc3200wifi: remove setting WEP keys before setting essid support Zhu Yi
2009-07-16  9:34             ` [PATCH 07/10] iwmc3200wifi: make iwm_send_wifi_if_cmd return 0 on success Zhu Yi
2009-07-16  9:34               ` [PATCH 08/10] iwmc3200wifi: remove key caches in driver Zhu Yi
2009-07-16  9:34                 ` [PATCH 09/10] cfg80211: remove WARN_ON in __cfg80211_sme_scan_done Zhu Yi
2009-07-16  9:39                   ` Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1247736854-6760-4-git-send-email-yi.zhu@intel.com \
    --to=yi.zhu@intel.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox