Skip to content

Commit

Permalink
cfg80211: infer WPA and WPA2 support from TKIP and CCMP
Browse files Browse the repository at this point in the history 
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
David Kilroy authored and John W. Linville committed Jul 10, 2009
1 parent 2ab658f commit 27bea66
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions net/wireless/wext-compat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 27bea66

Please sign in to comment.