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/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 9f3d23a..176d88c 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1604,12 +1604,8 @@
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 @@
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 @@
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 */