Commit 3daf0975 authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

cfg80211: Advertise ciphers via WE according to driver capability 



Signed-off-by: default avatarDavid Kilroy <kilroyd@googlemail.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f1f74825

net/wireless/wext-compat.c

+13 −2
Original line number Diff line number Diff line
@@ -204,8 +204,19 @@ 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 |

			  IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;

	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;

			break;



		case WLAN_CIPHER_SUITE_CCMP:

			range->enc_capa |= IW_ENC_CAPA_CIPHER_CCMP;

			break;

		}

	}



	for (band = 0; band < IEEE80211_NUM_BANDS; band ++) {

		int i;