From 139953f4f1e9bf7b8a6f13a7d0842de996f4da82 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Thu, 15 Jul 2010 16:16:17 -0400 Subject: [PATCH] --- yaml --- r: 203715 b: refs/heads/master c: 088c87262bbc39a01ebcd70817d35616785908b1 h: refs/heads/master i: 203713: 98aa71ba53a41fedc2bf0ba13828c23de414311b 203711: f0af2da8026fac770590940f505cbb0e023c7fa7 v: v3 --- [refs] | 2 +- trunk/net/mac80211/wep.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8de991a8c7cc..903b573095d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48d5548fc5e5ad79ca98a287b67f403834929739 +refs/heads/master: 088c87262bbc39a01ebcd70817d35616785908b1 diff --git a/trunk/net/mac80211/wep.c b/trunk/net/mac80211/wep.c index 6d133b6efce5..9ebc8d8a1f5b 100644 --- a/trunk/net/mac80211/wep.c +++ b/trunk/net/mac80211/wep.c @@ -32,13 +32,16 @@ int ieee80211_wep_init(struct ieee80211_local *local) local->wep_tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC); - if (IS_ERR(local->wep_tx_tfm)) + if (IS_ERR(local->wep_tx_tfm)) { + local->wep_rx_tfm = ERR_PTR(-EINVAL); return PTR_ERR(local->wep_tx_tfm); + } local->wep_rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC); if (IS_ERR(local->wep_rx_tfm)) { crypto_free_blkcipher(local->wep_tx_tfm); + local->wep_tx_tfm = ERR_PTR(-EINVAL); return PTR_ERR(local->wep_rx_tfm); }