diff options
| author | David Kilroy <kilroyd@googlemail.com> | 2009-06-18 23:21:17 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 15:01:42 -0400 |
| commit | 27bea66c22582853ad2e1de93d26c3016493818b (patch) | |
| tree | c5c95e1b5363c7fdb89d84ced6824342b9e3be3b /net | |
| parent | 2ab658f9ce218ae93b3d2db2b3fe68bfefb81196 (diff) | |
| download | lwn-27bea66c22582853ad2e1de93d26c3016493818b.tar.gz lwn-27bea66c22582853ad2e1de93d26c3016493818b.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/wext-compat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 2f7e7760bc7e..cae3b52fba7f 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c @@ -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: |