ath9k: remove bfs_keyix from struct ath_buf_state

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 826b665de9c2dab6550224703a18783c45888f19..e78f7f9bc3c778f814b1815627f1c4a49a6b7e1c 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -105,7 +105,6 @@ enum buffer_type {
 #define bf_al                  bf_state.bfs_al
 #define bf_frmlen              bf_state.bfs_frmlen
 #define bf_retries             bf_state.bfs_retries
-#define bf_keyix                bf_state.bfs_keyix
 #define bf_isht(bf)            (bf->bf_state.bf_type & BUF_HT)
 #define bf_isampdu(bf)         (bf->bf_state.bf_type & BUF_AMPDU)
 #define bf_isaggr(bf)          (bf->bf_state.bf_type & BUF_AGGR)
@@ -221,7 +220,6 @@ struct ath_buf_state {
        int bfs_retries;
        u8 bf_type;
        u8 bfs_paprd;
-       u32 bfs_keyix;
        enum ath9k_internal_frame_type bfs_ftype;
 };
 

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 9f3d23a4e5802d4f0f048b340f9ea711b11f646e..176d88c154c64c60781bab728840e7a179eda228 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1604,12 +1604,8 @@ static struct ath_buf *ath_tx_setup_buffer(struct ieee80211_hw *hw,
 
        bf->bf_flags = setup_tx_flags(skb);
 
-       if (tx_info->control.hw_key) {
+       if (tx_info->control.hw_key)
                bf->bf_frmlen += tx_info->control.hw_key->icv_len;
-               bf->bf_keyix = tx_info->control.hw_key->hw_key_idx;
-       } else {
-               bf->bf_keyix = ATH9K_TXKEYIX_INVALID;
-       }
 
        bf->bf_mpdu = skb;
 
@@ -1642,6 +1638,7 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
        struct ath_atx_tid *tid;
        struct ath_hw *ah = sc->sc_ah;
        enum ath9k_key_type keytype;
+       u32 keyix;
        int frm_type;
        __le16 fc;
        u8 tidno;
@@ -1656,8 +1653,13 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
        ath9k_hw_set_desc_link(ah, ds, 0);
 
        keytype = ath9k_cmn_get_hw_crypto_keytype(skb);
+       if (tx_info->control.hw_key)
+               keyix = tx_info->control.hw_key->hw_key_idx;
+       else
+               keyix = ATH9K_TXKEYIX_INVALID;
+
        ath9k_hw_set11n_txdesc(ah, ds, bf->bf_frmlen, frm_type, MAX_RATE_POWER,
-                              bf->bf_keyix, keytype, bf->bf_flags);
+                              keyix, keytype, bf->bf_flags);
 
        ath9k_hw_filltxdesc(ah, ds,
                            skb->len,   /* segment length */