Merge branches 'topic/fix/asoc', 'topic/fix/hda', 'topic/fix/misc' and 'topic/pci...

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / rt2x00 / rt2x00crypto.c

diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c
index e1448cfa94440f0c1ab2901d64b961fa8b235f73..5a858e5106c4c618969080242cf524b345923d0e 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00crypto.c
+++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c
@@ -56,10 +56,10 @@ unsigned int rt2x00crypto_tx_overhead(struct ieee80211_tx_info *tx_info)
         * note that these lengths should only be added when
         * mac80211 does not generate it.
         */
-       overhead += tx_info->control.icv_len;
+       overhead += key->icv_len;
 
        if (!(key->flags & IEEE80211_KEY_FLAG_GENERATE_IV))
-               overhead += tx_info->control.iv_len;
+               overhead += key->iv_len;
 
        if (!(key->flags & IEEE80211_KEY_FLAG_GENERATE_MMIC)) {
                if (key->alg == ALG_TKIP)