aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/wext-compat.c
diff options
context:
space:
mode:
authorDavid Kilroy <kilroyd@googlemail.com>2009-06-18 18:21:14 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 15:01:42 -0400
commit3daf097594d398b2ddd2dca6caeaa92cb9148e23 (patch)
treec7bc5ca18acbc26dde4bfd2df1859f3c35390365 /net/wireless/wext-compat.c
parentf1f74825fe01ac77204ca34e3240dec50a8207c2 (diff)
cfg80211: Advertise ciphers via WE according to driver capability
Signed-off-by: David Kilroy <kilroyd@googlemail.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/wext-compat.c')
-rw-r--r--net/wireless/wext-compat.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 9e56f3569e3e..7dbe6c62e5c8 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -204,8 +204,19 @@ int cfg80211_wext_giwrange(struct net_device *dev,
204 range->avg_qual.noise = range->max_qual.noise / 2; 204 range->avg_qual.noise = range->max_qual.noise / 2;
205 range->avg_qual.updated = range->max_qual.updated; 205 range->avg_qual.updated = range->max_qual.updated;
206 206
207 range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 | 207 range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2;
208 IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP; 208
209 for (c = 0; c < wdev->wiphy->n_cipher_suites; c++) {
210 switch (wdev->wiphy->cipher_suites[c]) {
211 case WLAN_CIPHER_SUITE_TKIP:
212 range->enc_capa |= IW_ENC_CAPA_CIPHER_TKIP;
213 break;
214
215 case WLAN_CIPHER_SUITE_CCMP:
216 range->enc_capa |= IW_ENC_CAPA_CIPHER_CCMP;
217 break;
218 }
219 }
209 220
210 for (band = 0; band < IEEE80211_NUM_BANDS; band ++) { 221 for (band = 0; band < IEEE80211_NUM_BANDS; band ++) {
211 int i; 222 int i;