summaryrefslogtreecommitdiffstats
path: root/net/wireless/sme.c
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2009-08-06 21:04:41 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-08-14 09:12:47 -0400
commitbcba8eae12fce23686b84a56d19f5fc78bf182ae (patch)
treef576449002a6f82d914c2af43563717a47651b59 /net/wireless/sme.c
parentb6f0b639089fb160b10984ac56e07e7043dabad7 (diff)
downloadlinux-stable-bcba8eae12fce23686b84a56d19f5fc78bf182ae.tar.gz
linux-stable-bcba8eae12fce23686b84a56d19f5fc78bf182ae.tar.bz2
linux-stable-bcba8eae12fce23686b84a56d19f5fc78bf182ae.zip
cfg80211: Set WEP ciphers
With iwconfig there is no way to properly set the ciphers when trying to connect to a WEP SSID. Although mac80211 based drivers dont need it, several fullmac drivers do. This patch basically sets the WEP ciphers whenever they're not set at all. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/sme.c')
-rw-r--r--net/wireless/sme.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 0b776b769c0f..340934f714b2 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -658,14 +658,28 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
if (connkeys && connkeys->def >= 0) {
int idx;
+ u32 cipher;
idx = connkeys->def;
+ cipher = connkeys->params[idx].cipher;
/* If given a WEP key we may need it for shared key auth */
- if (connkeys->params[idx].cipher == WLAN_CIPHER_SUITE_WEP40 ||
- connkeys->params[idx].cipher == WLAN_CIPHER_SUITE_WEP104) {
+ if (cipher == WLAN_CIPHER_SUITE_WEP40 ||
+ cipher == WLAN_CIPHER_SUITE_WEP104) {
connect->key_idx = idx;
connect->key = connkeys->params[idx].key;
connect->key_len = connkeys->params[idx].key_len;
+
+ /*
+ * If ciphers are not set (e.g. when going through
+ * iwconfig), we have to set them appropriately here.
+ */
+ if (connect->crypto.cipher_group == 0)
+ connect->crypto.cipher_group = cipher;
+
+ if (connect->crypto.n_ciphers_pairwise == 0) {
+ connect->crypto.n_ciphers_pairwise = 1;
+ connect->crypto.ciphers_pairwise[0] = cipher;
+ }
}
}