diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-30 16:18:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-30 16:18:53 -0400 |
| commit | 2a64cc4b793f8a84969401afe5a28bd08bc20c9b (patch) | |
| tree | 8a0233feae22b5c7e49bc6526579207f333922aa /net | |
| parent | aebb6a849cfe7d89bcacaaecc20a480dfc1180e7 (diff) | |
| parent | 23976efedd5ecb420b87455787c537eb4aed1981 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/wext.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index 6106cb79060c..e8404212ad57 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c | |||
| @@ -95,6 +95,13 @@ static int ieee80211_set_encryption(struct net_device *dev, u8 *sta_addr, | |||
| 95 | } | 95 | } |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | if (alg == ALG_WEP && | ||
| 99 | key_len != LEN_WEP40 && key_len != LEN_WEP104) { | ||
| 100 | ieee80211_key_free(key); | ||
| 101 | err = -EINVAL; | ||
| 102 | goto out_unlock; | ||
| 103 | } | ||
| 104 | |||
| 98 | ieee80211_key_link(key, sdata, sta); | 105 | ieee80211_key_link(key, sdata, sta); |
| 99 | 106 | ||
| 100 | if (set_tx_key || (!sta && !sdata->default_key && key)) | 107 | if (set_tx_key || (!sta && !sdata->default_key && key)) |