Skip to content

Commit

Permalink
cfg80211: set WE encoding size based on available ciphers
Browse files Browse the repository at this point in the history
Only set the sizes for WEP40 and WEP104.

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 51cd4aa commit 2ab658f
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions net/wireless/wext-compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}

Expand Down

0 comments on commit 2ab658f

Please sign in to comment.