Merge branches 'acpi-misc' and 'acpi-video'

[linux.git] / net / mac80211 / wpa.c

diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index a51c7909366e6aefe0ce96449ef648b3beec300f..ee72779729e5350858514811b9daa86ecd75aa81 100644 (file)
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -239,7 +239,7 @@ static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
        /* Add room for ICV */
        skb_put(skb, IEEE80211_TKIP_ICV_LEN);
 
-       return ieee80211_tkip_encrypt_data(tx->local->wep_tx_tfm,
+       return ieee80211_tkip_encrypt_data(&tx->local->wep_tx_ctx,
                                           key, skb, pos, len);
 }
 
@@ -290,7 +290,7 @@ ieee80211_crypto_tkip_decrypt(struct ieee80211_rx_data *rx)
        if (status->flag & RX_FLAG_DECRYPTED)
                hwaccel = 1;
 
-       res = ieee80211_tkip_decrypt_data(rx->local->wep_rx_tfm,
+       res = ieee80211_tkip_decrypt_data(&rx->local->wep_rx_ctx,
                                          key, skb->data + hdrlen,
                                          skb->len - hdrlen, rx->sta->sta.addr,
                                          hdr->addr1, hwaccel, rx->security_idx,