diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-08-10 11:46:38 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-17 00:45:11 +0400 |
| commit | 97359d1235eaf634fe706c9faa6e40181cc95fb8 (patch) | |
| tree | 5799455c94622eaa6a4fb065bd3b5c350bb705e0 /net/mac80211/wep.c | |
| parent | 915a824e30c503157c38115eb6a85f60bb653738 (diff) | |
| download | linux-97359d1235eaf634fe706c9faa6e40181cc95fb8.tar.xz | |
mac80211: use cipher suite selectors
Currently, mac80211 translates the cfg80211
cipher suite selectors into ALG_* values.
That isn't all too useful, and some drivers
benefit from the distinction between WEP40
and WEP104 as well. Therefore, convert it
all to use the cipher suite selectors.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wep.c')
| -rw-r--r-- | net/mac80211/wep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c index 9ebc8d8a1f5b..f27484c22b9f 100644 --- a/net/mac80211/wep.c +++ b/net/mac80211/wep.c @@ -240,7 +240,7 @@ static int ieee80211_wep_decrypt(struct ieee80211_local *local, keyidx = skb->data[hdrlen + 3] >> 6; - if (!key || keyidx != key->conf.keyidx || key->conf.alg != ALG_WEP) + if (!key || keyidx != key->conf.keyidx) return -1; klen = 3 + key->conf.keylen; |