wifi: mac80211: allow beacon protection HW offload
authorJohannes Berg <johannes.berg@intel.com>
Wed, 1 Mar 2023 10:09:17 +0000 (12:09 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 7 Mar 2023 09:30:04 +0000 (10:30 +0100)
In case of beacon protection, check if the key was offloaded
to the hardware and in that case set control.hw_key so that
the encryption function will see it and only do the needed
steps that aren't done in hardware.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230301115906.b2becd9a22fb.I6c0b9c50c6a481128ba912a11cb7afc92c4b6da7@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/tx.c

index 1f9294f..628d60f 100644 (file)
@@ -5121,6 +5121,10 @@ static int ieee80211_beacon_protect(struct sk_buff *skb,
                return -EINVAL;
        }
 
+       if (!(tx.key->conf.flags & IEEE80211_KEY_FLAG_SW_MGMT_TX) &&
+           tx.key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)
+               IEEE80211_SKB_CB(skb)->control.hw_key = &tx.key->conf;
+
        tx.local = local;
        tx.sdata = sdata;
        __skb_queue_head_init(&tx.skbs);