mac80211: remove ieee80211_get_key_tx_seq/ieee80211_set_key_tx_seq

Since the PNs of all the tx keys are now tracked in the public
part of the key struct (with atomic counter), we no longer
need these functions.

dvm and vt665{5,6} are currently the only users of these functions,
so update them accordingly.

Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

3 files changed, 24 insertions, 20 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;
 
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index b668db6a45fb..1a2dda09b69d 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -1210,7 +1210,7 @@ static void vnt_fill_txkey(struct ieee80211_hdr *hdr, u8 *key_buffer,
                            struct sk_buff *skb, u16 payload_len,
                            struct vnt_mic_hdr *mic_hdr)
 {
-        struct ieee80211_key_seq seq;
+        u64 pn64;
         u8 *iv = ((u8 *)hdr + ieee80211_get_hdrlen_from_skb(skb));
 
         /* strip header and icv len from payload */
@@ -1243,9 +1243,13 @@ static void vnt_fill_txkey(struct ieee80211_hdr *hdr, u8 *key_buffer,
                 mic_hdr->payload_len = cpu_to_be16(payload_len);
                 ether_addr_copy(mic_hdr->mic_addr2, hdr->addr2);
 
-                ieee80211_get_key_tx_seq(tx_key, &seq);
-
-                memcpy(mic_hdr->ccmp_pn, seq.ccmp.pn, IEEE80211_CCMP_PN_LEN);
+                pn64 = atomic64_read(&tx_key->tx_pn);
+                mic_hdr->ccmp_pn[5] = pn64;
+                mic_hdr->ccmp_pn[4] = pn64 >> 8;
+                mic_hdr->ccmp_pn[3] = pn64 >> 16;
+                mic_hdr->ccmp_pn[2] = pn64 >> 24;
+                mic_hdr->ccmp_pn[1] = pn64 >> 32;
+                mic_hdr->ccmp_pn[0] = pn64 >> 40;
 
                 if (ieee80211_has_a4(hdr->frame_control))
                         mic_hdr->hlen = cpu_to_be16(28);
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index efb54f53b4f9..76378d225b46 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -719,7 +719,7 @@ static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context,
         u16 payload_len, struct vnt_mic_hdr *mic_hdr)
 {
         struct ieee80211_hdr *hdr = tx_context->hdr;
-        struct ieee80211_key_seq seq;
+        u64 pn64;
         u8 *iv = ((u8 *)hdr + ieee80211_get_hdrlen_from_skb(skb));
 
         /* strip header and icv len from payload */
@@ -752,9 +752,13 @@ static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context,
                 mic_hdr->payload_len = cpu_to_be16(payload_len);
                 ether_addr_copy(mic_hdr->mic_addr2, hdr->addr2);
 
-                ieee80211_get_key_tx_seq(tx_key, &seq);
-
-                memcpy(mic_hdr->ccmp_pn, seq.ccmp.pn, IEEE80211_CCMP_PN_LEN);
+                pn64 = atomic64_read(&tx_key->tx_pn);
+                mic_hdr->ccmp_pn[5] = pn64;
+                mic_hdr->ccmp_pn[4] = pn64 >> 8;
+                mic_hdr->ccmp_pn[3] = pn64 >> 16;
+                mic_hdr->ccmp_pn[2] = pn64 >> 24;
+                mic_hdr->ccmp_pn[1] = pn64 >> 32;
+                mic_hdr->ccmp_pn[0] = pn64 >> 40;
 
                 if (ieee80211_has_a4(hdr->frame_control))
                         mic_hdr->hlen = cpu_to_be16(28);