1 files changed, 8 insertions, 12 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/lib.c b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
index 4841be2aa499..1799469268ea 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c
@@ -943,14 +943,16 @@ static void iwlagn_wowlan_program_keys(struct ieee80211_hw *hw,
         switch (key->cipher) {
         case WLAN_CIPHER_SUITE_TKIP:
                 if (sta) {
+                        u64 pn64;
+
                         tkip_sc = data->rsc_tsc->all_tsc_rsc.tkip.unicast_rsc;
                         tkip_tx_sc = &data->rsc_tsc->all_tsc_rsc.tkip.tsc;
 
                         rx_p1ks = data->tkip->rx_uni;
 
-                        ieee80211_get_key_tx_seq(key, &seq);
-                        tkip_tx_sc->iv16 = cpu_to_le16(seq.tkip.iv16);
-                        tkip_tx_sc->iv32 = cpu_to_le32(seq.tkip.iv32);
+                        pn64 = atomic64_read(&key->tx_pn);
+                        tkip_tx_sc->iv16 = cpu_to_le16(TKIP_PN_TO_IV16(pn64));
+                        tkip_tx_sc->iv32 = cpu_to_le32(TKIP_PN_TO_IV32(pn64));
 
                         ieee80211_get_tkip_p1k_iv(key, seq.tkip.iv32, p1k);
                         iwlagn_convert_p1k(p1k, data->tkip->tx.p1k);
@@ -996,19 +998,13 @@ static void iwlagn_wowlan_program_keys(struct ieee80211_hw *hw,
                 break;
         case WLAN_CIPHER_SUITE_CCMP:
                 if (sta) {
-                        u8 *pn = seq.ccmp.pn;
+                        u64 pn64;
 
                         aes_sc = data->rsc_tsc->all_tsc_rsc.aes.unicast_rsc;
                         aes_tx_sc = &data->rsc_tsc->all_tsc_rsc.aes.tsc;
 
-                        ieee80211_get_key_tx_seq(key, &seq);
-                        aes_tx_sc->pn = cpu_to_le64(
-                                        (u64)pn[5] |
-                                        ((u64)pn[4] << 8) |
-                                        ((u64)pn[3] << 16) |
-                                        ((u64)pn[2] << 24) |
-                                        ((u64)pn[1] << 32) |
-                                        ((u64)pn[0] << 40));
+                        pn64 = atomic64_read(&key->tx_pn);
+                        aes_tx_sc->pn = cpu_to_le64(pn64);
                 } else
                         aes_sc = data->rsc_tsc->all_tsc_rsc.aes.multicast_rsc;