tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: mac80211: refactor ieee80211_select_link_key()

Browse Source 
Simplify ieee80211_select_link_key(), no functional changes are made.

Signed-off-by: Mukesh Sisodiya <mukesh.sisodiya@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230604120651.a4e332755bb0.Iff4a2b6ed767b2a329c51c29bb597ece9ebe2af8@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Mukesh Sisodiya
2023-06-04 12:11:14 +03:00
committed by Johannes Berg
parent 2a5325f802
commit 1d10575bce
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/mac80211/tx.c
+7 -23
View File
@@ -581,25 +581,9 @@ ieee80211_select_link_key(struct ieee80211_tx_data *tx)
{
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
enum {
USE_NONE,
USE_MGMT_KEY,
USE_MCAST_KEY,
} which_key = USE_NONE;
struct ieee80211_link_data *link;
unsigned int link_id;
if (ieee80211_is_group_privacy_action(tx->skb))
which_key = USE_MCAST_KEY;
else if (ieee80211_is_mgmt(hdr->frame_control) &&
is_multicast_ether_addr(hdr->addr1) &&
ieee80211_is_robust_mgmt_frame(tx->skb))
which_key = USE_MGMT_KEY;
else if (is_multicast_ether_addr(hdr->addr1))
which_key = USE_MCAST_KEY;
else
return NULL;
link_id = u32_get_bits(info->control.flags, IEEE80211_TX_CTRL_MLO_LINK);
if (link_id == IEEE80211_LINK_UNSPECIFIED) {
link = &tx->sdata->deflink;
@@ -609,14 +593,14 @@ ieee80211_select_link_key(struct ieee80211_tx_data *tx)
return NULL;
}
switch (which_key) {
case USE_NONE:
break;
case USE_MGMT_KEY:
return rcu_dereference(link->default_mgmt_key);
case USE_MCAST_KEY:
if (ieee80211_is_group_privacy_action(tx->skb))
return rcu_dereference(link->default_multicast_key);
else if (ieee80211_is_mgmt(hdr->frame_control) &&
is_multicast_ether_addr(hdr->addr1) &&
ieee80211_is_robust_mgmt_frame(tx->skb))
return rcu_dereference(link->default_mgmt_key);
else if (is_multicast_ether_addr(hdr->addr1))
return rcu_dereference(link->default_multicast_key);
}
return NULL;
}