Commit 2ab658f9 authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

cfg80211: set WE encoding size based on available ciphers 



Only set the sizes for WEP40 and WEP104.

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 51cd4aab

net/wireless/wext-compat.c

+10 −3
Original line number Diff line number Diff line
@@ -173,9 +173,6 @@ int cfg80211_wext_giwrange(struct net_device *dev, 
	range->min_frag = 256;

	range->max_frag = 2346;



	range->encoding_size[0] = 5;

	range->encoding_size[1] = 13;

	range->num_encoding_sizes = 2;

	range->max_encoding_tokens = 4;



	range->max_qual.updated = IW_QUAL_NOISE_INVALID;
@@ -215,6 +212,16 @@ int cfg80211_wext_giwrange(struct net_device *dev, 
		case WLAN_CIPHER_SUITE_CCMP:

			range->enc_capa |= IW_ENC_CAPA_CIPHER_CCMP;

			break;



		case WLAN_CIPHER_SUITE_WEP40:

			range->encoding_size[range->num_encoding_sizes++] =

				WLAN_KEY_LEN_WEP40;

			break;



		case WLAN_CIPHER_SUITE_WEP104:

			range->encoding_size[range->num_encoding_sizes++] =

				WLAN_KEY_LEN_WEP104;

			break;

		}

	}