mac80211: free up 2 bytes in skb->cb

Free up 2 bytes in skb->cb to be used for multi-rate retry later.
Move iv_len and icv_len initialization into key alloc.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index f5f5b1ff1584..feb3be81dfa6 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -337,8 +337,6 @@ struct ieee80211_tx_info {
                         unsigned long jiffies;
                         s8 rts_cts_rate_idx, alt_retry_rate_idx;
                         u8 retry_limit;
-                        u8 icv_len;
-                        u8 iv_len;
                 } control;
                 struct {
                         u64 ampdu_ack_map;
@@ -635,6 +633,8 @@ enum ieee80211_key_flags {
  */
 struct ieee80211_key_conf {
         enum ieee80211_key_alg alg;
+        u8 icv_len;
+        u8 iv_len;
         u8 hw_key_idx;
         u8 flags;
         s8 keyidx;