Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6] / net / ieee80211 / ieee80211_crypt_wep.c

diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c
index 9eeec13c28b07f07513c8a8df5fe6be43550b384..1b2efff11d39ff63fab9935e070b62d01897c193 100644 (file)
--- a/net/ieee80211/ieee80211_crypt_wep.c
+++ b/net/ieee80211/ieee80211_crypt_wep.c
@@ -50,7 +50,7 @@ static void *prism2_wep_init(int keyidx)
        if (IS_ERR(priv->tx_tfm)) {
                printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
                       "crypto API arc4\n");
-               priv->tfm = NULL;
+               priv->tx_tfm = NULL;
                goto fail;
        }
 
@@ -58,6 +58,7 @@ static void *prism2_wep_init(int keyidx)
        if (IS_ERR(priv->rx_tfm)) {
                printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
                       "crypto API arc4\n");
+               priv->rx_tfm = NULL;
                goto fail;
        }
        /* start WEP IV from a random value */