Merge branch 'work.misc-set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / net / mac80211 / debugfs_key.c

diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c
index 7961e7d0b61e1ee48700e9a7ef2db8feec84814f..a2ef95f16f116ae905049c595742bcee3e78c6c7 100644 (file)
--- a/net/mac80211/debugfs_key.c
+++ b/net/mac80211/debugfs_key.c
@@ -132,9 +132,10 @@ static ssize_t key_tx_spec_read(struct file *file, char __user *userbuf,
                len = scnprintf(buf, sizeof(buf), "\n");
                break;
        case WLAN_CIPHER_SUITE_TKIP:
+               pn = atomic64_read(&key->conf.tx_pn);
                len = scnprintf(buf, sizeof(buf), "%08x %04x\n",
-                               key->u.tkip.tx.iv32,
-                               key->u.tkip.tx.iv16);
+                               TKIP_PN_TO_IV32(pn),
+                               TKIP_PN_TO_IV16(pn));
                break;
        case WLAN_CIPHER_SUITE_CCMP:
        case WLAN_CIPHER_SUITE_CCMP_256: