cfg80211: infer WPA and WPA2 support from TKIP and CCMP

Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
David Kilroy 2009-06-18 23:21:17 +01:00 committed by John W. Linville
parent 2ab658f9ce
commit 27bea66c22

View File

@ -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: