averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-06-21 15:43:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

wifi: mac80211: move frame RX handling to type files

Browse Source 
The interface frame queue processing code currently
differentiates many frame types and below those the
interface types, but then falls through to per-type
processing. Move this code to the per-type functions,
creating a new ap.c file that gets relevant code, and
this way reduce the number of non-static symbols.

This also helps with adding more cases for UHR later.

Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20260428103649.c00059e68a07.I2269130278390f534d6051fac424402a854a54aa@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg
2026-04-28 10:36:49 +02:00
parent 3acaadfe91
commit 49e62ec6eb
6 changed files with 394 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/mac80211/Makefile
+1 -1
View File
@@ -30,7 +30,7 @@ mac80211-y := \
key.o \
util.o parse.o \
wme.o \
chan.o \
chan.o ap.o \
trace.o mlme.o \
tdls.o \
ocb.o \
net/mac80211/ap.c
+207
View File
@@ -0,0 +1,207 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* AP handling
*
* Partially
* Copyright (C) 2026 Intel Corporation
*/
#include "driver-ops.h"
#include "ieee80211_i.h"
static void
ieee80211_send_eml_op_mode_notif(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *req, int opt_len)
{
int len = IEEE80211_MIN_ACTION_SIZE(eml_omn);
struct ieee80211_local *local = sdata->local;
struct ieee80211_mgmt *mgmt;
struct sk_buff *skb;
len += opt_len; /* optional len */
skb = dev_alloc_skb(local->tx_headroom + len);
if (!skb)
return;
skb_reserve(skb, local->tx_headroom);
mgmt = skb_put_zero(skb, len);
mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
IEEE80211_STYPE_ACTION);
memcpy(mgmt->da, req->sa, ETH_ALEN);
memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
mgmt->u.action.category = WLAN_CATEGORY_PROTECTED_EHT;
mgmt->u.action.action_code =
WLAN_PROTECTED_EHT_ACTION_EML_OP_MODE_NOTIF;
mgmt->u.action.eml_omn.dialog_token =
req->u.action.eml_omn.dialog_token;
mgmt->u.action.eml_omn.control = req->u.action.eml_omn.control &
~(IEEE80211_EML_CTRL_EMLSR_PARAM_UPDATE |
IEEE80211_EML_CTRL_INDEV_COEX_ACT);
/* Copy optional fields from the received notification frame */
memcpy(mgmt->u.action.eml_omn.variable,
req->u.action.eml_omn.variable, opt_len);
ieee80211_tx_skb(sdata, skb);
}
static void
ieee80211_rx_eml_op_mode_notif(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb)
{
int len = IEEE80211_MIN_ACTION_SIZE(eml_omn);
enum nl80211_iftype type = ieee80211_vif_type_p2p(&sdata->vif);
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
const struct wiphy_iftype_ext_capab *ift_ext_capa;
struct ieee80211_mgmt *mgmt = (void *)skb->data;
struct ieee80211_local *local = sdata->local;
u8 control = mgmt->u.action.eml_omn.control;
u8 *ptr = mgmt->u.action.eml_omn.variable;
struct ieee80211_eml_params eml_params = {
.link_id = status->link_id,
.control = control,
};
struct sta_info *sta;
int opt_len = 0;
if (!ieee80211_vif_is_mld(&sdata->vif))
return;
/* eMLSR and eMLMR can't be enabled at the same time */
if ((control & IEEE80211_EML_CTRL_EMLSR_MODE) &&
(control & IEEE80211_EML_CTRL_EMLMR_MODE))
return;
if ((control & IEEE80211_EML_CTRL_EMLMR_MODE) &&
(control & IEEE80211_EML_CTRL_EMLSR_PARAM_UPDATE))
return;
ift_ext_capa = cfg80211_get_iftype_ext_capa(local->hw.wiphy, type);
if (!ift_ext_capa)
return;
if (!status->link_valid)
return;
sta = sta_info_get_bss(sdata, mgmt->sa);
if (!sta)
return;
if (control & IEEE80211_EML_CTRL_EMLSR_MODE) {
u8 emlsr_param_update_len;
if (!(ift_ext_capa->eml_capabilities &
IEEE80211_EML_CAP_EMLSR_SUPP))
return;
opt_len += sizeof(__le16); /* eMLSR link_bitmap */
/*
* eMLSR param update field is not part of Notification frame
* sent by the AP to client so account it separately.
*/
emlsr_param_update_len =
!!(control & IEEE80211_EML_CTRL_EMLSR_PARAM_UPDATE);
if (skb->len < len + opt_len + emlsr_param_update_len)
return;
if (control & IEEE80211_EML_CTRL_EMLSR_PARAM_UPDATE) {
u8 pad_delay, trans_delay;
pad_delay = u8_get_bits(ptr[2],
IEEE80211_EML_EMLSR_PAD_DELAY);
if (pad_delay >
IEEE80211_EML_CAP_EML_PADDING_DELAY_256US)
return;
trans_delay = u8_get_bits(ptr[2],
IEEE80211_EML_EMLSR_TRANS_DELAY);
if (trans_delay >
IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_256US)
return;
/* Update sta padding and transition delay */
sta->sta.eml_cap =
u8_replace_bits(sta->sta.eml_cap,
pad_delay,
IEEE80211_EML_CAP_EML_PADDING_DELAY);
sta->sta.eml_cap =
u8_replace_bits(sta->sta.eml_cap,
trans_delay,
IEEE80211_EML_CAP_EML_TRANSITION_DELAY);
}
}
if (control & IEEE80211_EML_CTRL_EMLMR_MODE) {
u8 mcs_map_size;
int i;
if (!(ift_ext_capa->eml_capabilities &
IEEE80211_EML_CAP_EMLMR_SUPPORT))
return;
opt_len += sizeof(__le16); /* eMLMR link_bitmap */
opt_len++; /* eMLMR mcs_map_count */
if (skb->len < len + opt_len)
return;
eml_params.emlmr_mcs_map_count = ptr[2];
if (eml_params.emlmr_mcs_map_count > 2)
return;
mcs_map_size = 3 * (1 + eml_params.emlmr_mcs_map_count);
opt_len += mcs_map_size;
if (skb->len < len + opt_len)
return;
for (i = 0; i < mcs_map_size; i++) {
u8 rx_mcs, tx_mcs;
rx_mcs = u8_get_bits(ptr[3 + i],
IEEE80211_EML_EMLMR_RX_MCS_MAP);
if (rx_mcs > 8)
return;
tx_mcs = u8_get_bits(ptr[3 + i],
IEEE80211_EML_EMLMR_TX_MCS_MAP);
if (tx_mcs > 8)
return;
}
memcpy(eml_params.emlmr_mcs_map_bw, &ptr[3], mcs_map_size);
}
if ((control & IEEE80211_EML_CTRL_EMLSR_MODE) ||
(control & IEEE80211_EML_CTRL_EMLMR_MODE)) {
eml_params.link_bitmap = get_unaligned_le16(ptr);
if ((eml_params.link_bitmap & sdata->vif.active_links) !=
eml_params.link_bitmap)
return;
}
if (drv_set_eml_op_mode(sdata, &sta->sta, &eml_params))
return;
ieee80211_send_eml_op_mode_notif(sdata, mgmt, opt_len);
}
void ieee80211_ap_rx_queued_frame(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb)
{
struct ieee80211_mgmt *mgmt = (void *)skb->data;
/* rx.c cannot queue any non-action frames to AP interfaces */
if (WARN_ON(!ieee80211_is_action(mgmt->frame_control)))
return;
switch (mgmt->u.action.category) {
case WLAN_CATEGORY_PROTECTED_EHT:
switch (mgmt->u.action.action_code) {
case WLAN_PROTECTED_EHT_ACTION_EML_OP_MODE_NOTIF:
ieee80211_rx_eml_op_mode_notif(sdata, skb);
break;
}
break;
}
}
net/mac80211/eht.c
-174
View File
@@ -100,177 +100,3 @@ ieee80211_eht_cap_ie_to_sta_eht_cap(struct ieee80211_sub_if_data *sdata,
ieee80211_sta_recalc_aggregates(&link_sta->sta->sta);
}
static void
ieee80211_send_eml_op_mode_notif(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *req, int opt_len)
{
int len = IEEE80211_MIN_ACTION_SIZE(eml_omn);
struct ieee80211_local *local = sdata->local;
struct ieee80211_mgmt *mgmt;
struct sk_buff *skb;
len += opt_len; /* optional len */
skb = dev_alloc_skb(local->tx_headroom + len);
if (!skb)
return;
skb_reserve(skb, local->tx_headroom);
mgmt = skb_put_zero(skb, len);
mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
IEEE80211_STYPE_ACTION);
memcpy(mgmt->da, req->sa, ETH_ALEN);
memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
mgmt->u.action.category = WLAN_CATEGORY_PROTECTED_EHT;
mgmt->u.action.action_code = WLAN_PROTECTED_EHT_ACTION_EML_OP_MODE_NOTIF;
mgmt->u.action.eml_omn.dialog_token =
req->u.action.eml_omn.dialog_token;
mgmt->u.action.eml_omn.control = req->u.action.eml_omn.control &
~(IEEE80211_EML_CTRL_EMLSR_PARAM_UPDATE |
IEEE80211_EML_CTRL_INDEV_COEX_ACT);
/* Copy optional fields from the received notification frame */
memcpy(mgmt->u.action.eml_omn.variable,
req->u.action.eml_omn.variable, opt_len);
ieee80211_tx_skb(sdata, skb);
}
void ieee80211_rx_eml_op_mode_notif(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb)
{
int len = IEEE80211_MIN_ACTION_SIZE(eml_omn);
enum nl80211_iftype type = ieee80211_vif_type_p2p(&sdata->vif);
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
const struct wiphy_iftype_ext_capab *ift_ext_capa;
struct ieee80211_mgmt *mgmt = (void *)skb->data;
struct ieee80211_local *local = sdata->local;
u8 control = mgmt->u.action.eml_omn.control;
u8 *ptr = mgmt->u.action.eml_omn.variable;
struct ieee80211_eml_params eml_params = {
.link_id = status->link_id,
.control = control,
};
struct sta_info *sta;
int opt_len = 0;
if (!ieee80211_vif_is_mld(&sdata->vif))
return;
/* eMLSR and eMLMR can't be enabled at the same time */
if ((control & IEEE80211_EML_CTRL_EMLSR_MODE) &&
(control & IEEE80211_EML_CTRL_EMLMR_MODE))
return;
if ((control & IEEE80211_EML_CTRL_EMLMR_MODE) &&
(control & IEEE80211_EML_CTRL_EMLSR_PARAM_UPDATE))
return;
ift_ext_capa = cfg80211_get_iftype_ext_capa(local->hw.wiphy, type);
if (!ift_ext_capa)
return;
if (!status->link_valid)
return;
sta = sta_info_get_bss(sdata, mgmt->sa);
if (!sta)
return;
if (control & IEEE80211_EML_CTRL_EMLSR_MODE) {
u8 emlsr_param_update_len;
if (!(ift_ext_capa->eml_capabilities &
IEEE80211_EML_CAP_EMLSR_SUPP))
return;
opt_len += sizeof(__le16); /* eMLSR link_bitmap */
/* eMLSR param update field is not part of Notfication frame
* sent by the AP to client so account it separately.
*/
emlsr_param_update_len =
!!(control & IEEE80211_EML_CTRL_EMLSR_PARAM_UPDATE);
if (skb->len < len + opt_len + emlsr_param_update_len)
return;
if (control & IEEE80211_EML_CTRL_EMLSR_PARAM_UPDATE) {
u8 pad_delay, trans_delay;
pad_delay = u8_get_bits(ptr[2],
IEEE80211_EML_EMLSR_PAD_DELAY);
if (pad_delay >
IEEE80211_EML_CAP_EML_PADDING_DELAY_256US)
return;
trans_delay = u8_get_bits(ptr[2],
IEEE80211_EML_EMLSR_TRANS_DELAY);
if (trans_delay >
IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY_256US)
return;
/* Update sta padding and transition delay */
sta->sta.eml_cap =
u8_replace_bits(sta->sta.eml_cap,
pad_delay,
IEEE80211_EML_CAP_EML_PADDING_DELAY);
sta->sta.eml_cap =
u8_replace_bits(sta->sta.eml_cap,
trans_delay,
IEEE80211_EML_CAP_EML_TRANSITION_DELAY);
}
}
if (control & IEEE80211_EML_CTRL_EMLMR_MODE) {
u8 mcs_map_size;
int i;
if (!(ift_ext_capa->eml_capabilities &
IEEE80211_EML_CAP_EMLMR_SUPPORT))
return;
opt_len += sizeof(__le16); /* eMLMR link_bitmap */
opt_len++; /* eMLMR mcs_map_count */
if (skb->len < len + opt_len)
return;
eml_params.emlmr_mcs_map_count = ptr[2];
if (eml_params.emlmr_mcs_map_count > 2)
return;
mcs_map_size = 3 * (1 + eml_params.emlmr_mcs_map_count);
opt_len += mcs_map_size;
if (skb->len < len + opt_len)
return;
for (i = 0; i < mcs_map_size; i++) {
u8 rx_mcs, tx_mcs;
rx_mcs = u8_get_bits(ptr[3 + i],
IEEE80211_EML_EMLMR_RX_MCS_MAP);
if (rx_mcs > 8)
return;
tx_mcs = u8_get_bits(ptr[3 + i],
IEEE80211_EML_EMLMR_TX_MCS_MAP);
if (tx_mcs > 8)
return;
}
memcpy(eml_params.emlmr_mcs_map_bw, &ptr[3], mcs_map_size);
}
if ((control & IEEE80211_EML_CTRL_EMLSR_MODE) ||
(control & IEEE80211_EML_CTRL_EMLMR_MODE)) {
eml_params.link_bitmap = get_unaligned_le16(ptr);
if ((eml_params.link_bitmap & sdata->vif.active_links) !=
eml_params.link_bitmap)
return;
}
if (drv_set_eml_op_mode(sdata, &sta->sta, &eml_params))
return;
ieee80211_send_eml_op_mode_notif(sdata, mgmt, opt_len);
}
net/mac80211/ieee80211_i.h
+6 -17
View File
@@ -1973,6 +1973,10 @@ void ieee80211_clear_fast_rx(struct sta_info *sta);
bool ieee80211_is_our_addr(struct ieee80211_sub_if_data *sdata,
const u8 *addr, int *out_link_id);
/* AP code */
void ieee80211_ap_rx_queued_frame(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb);
/* STA code */
void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata);
int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
@@ -1988,10 +1992,8 @@ void ieee80211_send_pspoll(struct ieee80211_local *local,
void ieee80211_recalc_ps(struct ieee80211_local *local);
void ieee80211_recalc_ps_vif(struct ieee80211_sub_if_data *sdata);
void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata);
void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb);
void ieee80211_sta_rx_queued_ext(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb);
void ieee80211_sta_rx_queued_frame(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb);
void ieee80211_sta_reset_beacon_monitor(struct ieee80211_sub_if_data *sdata);
void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata);
void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata);
@@ -2878,8 +2880,6 @@ void ieee80211_destroy_frag_cache(struct ieee80211_fragment_cache *cache);
u8 ieee80211_ie_len_eht_cap(struct ieee80211_sub_if_data *sdata);
void ieee80211_rx_eml_op_mode_notif(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb);
void
ieee80211_eht_cap_ie_to_sta_eht_cap(struct ieee80211_sub_if_data *sdata,
struct ieee80211_supported_band *sband,
@@ -2887,28 +2887,17 @@ ieee80211_eht_cap_ie_to_sta_eht_cap(struct ieee80211_sub_if_data *sdata,
const struct ieee80211_eht_cap_elem *eht_cap_ie_elem,
u8 eht_cap_len,
struct link_sta_info *link_sta);
void ieee80211_process_neg_ttlm_req(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len);
void ieee80211_process_neg_ttlm_res(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len);
int ieee80211_req_neg_ttlm(struct ieee80211_sub_if_data *sdata,
struct cfg80211_ttlm_params *params);
void ieee80211_process_ttlm_teardown(struct ieee80211_sub_if_data *sdata);
void ieee80211_check_wbrf_support(struct ieee80211_local *local);
void ieee80211_add_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef);
void ieee80211_remove_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef);
int ieee80211_mgd_set_epcs(struct ieee80211_sub_if_data *sdata, bool enable);
void ieee80211_process_epcs_ena_resp(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len);
void ieee80211_process_epcs_teardown(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len);
int ieee80211_mgd_assoc_ml_reconf(struct ieee80211_sub_if_data *sdata,
struct cfg80211_ml_reconf_req *req);
void ieee80211_process_ml_reconf_resp(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len);
void ieee80211_stop_mbssid(struct ieee80211_sub_if_data *sdata);
void
net/mac80211/iface.c
+4 -45
View File
@@ -1716,50 +1716,6 @@ static void ieee80211_iface_process_skb(struct ieee80211_local *local,
default:
break;
}
} else if (ieee80211_is_action(mgmt->frame_control) &&
mgmt->u.action.category == WLAN_CATEGORY_PROTECTED_EHT) {
if (sdata->vif.type == NL80211_IFTYPE_AP) {
switch (mgmt->u.action.action_code) {
case WLAN_PROTECTED_EHT_ACTION_EML_OP_MODE_NOTIF:
ieee80211_rx_eml_op_mode_notif(sdata, skb);
break;
default:
break;
}
} else if (sdata->vif.type == NL80211_IFTYPE_STATION) {
switch (mgmt->u.action.action_code) {
case WLAN_PROTECTED_EHT_ACTION_TTLM_REQ:
ieee80211_process_neg_ttlm_req(sdata, mgmt,
skb->len);
break;
case WLAN_PROTECTED_EHT_ACTION_TTLM_RES:
ieee80211_process_neg_ttlm_res(sdata, mgmt,
skb->len);
break;
case WLAN_PROTECTED_EHT_ACTION_TTLM_TEARDOWN:
ieee80211_process_ttlm_teardown(sdata);
break;
case WLAN_PROTECTED_EHT_ACTION_LINK_RECONFIG_RESP:
ieee80211_process_ml_reconf_resp(sdata, mgmt,
skb->len);
break;
case WLAN_PROTECTED_EHT_ACTION_EPCS_ENABLE_RESP:
ieee80211_process_epcs_ena_resp(sdata, mgmt,
skb->len);
break;
case WLAN_PROTECTED_EHT_ACTION_EPCS_ENABLE_TEARDOWN:
ieee80211_process_epcs_teardown(sdata, mgmt,
skb->len);
break;
default:
break;
}
}
} else if (ieee80211_is_ext(mgmt->frame_control)) {
if (sdata->vif.type == NL80211_IFTYPE_STATION)
ieee80211_sta_rx_queued_ext(sdata, skb);
else
WARN_ON(1);
} else if (ieee80211_is_data_qos(mgmt->frame_control)) {
struct ieee80211_hdr *hdr = (void *)mgmt;
struct sta_info *sta;
@@ -1791,8 +1747,11 @@ static void ieee80211_iface_process_skb(struct ieee80211_local *local,
true);
}
} else switch (sdata->vif.type) {
case NL80211_IFTYPE_AP:
ieee80211_ap_rx_queued_frame(sdata, skb);
break;
case NL80211_IFTYPE_STATION:
ieee80211_sta_rx_queued_mgmt(sdata, skb);
ieee80211_sta_rx_queued_frame(sdata, skb);
break;
case NL80211_IFTYPE_ADHOC:
ieee80211_ibss_rx_queued_mgmt(sdata, skb);
net/mac80211/mlme.c
+176 -136
View File
@@ -8181,8 +8181,9 @@ ieee80211_parse_neg_ttlm(struct ieee80211_sub_if_data *sdata,
return 0;
}
void ieee80211_process_neg_ttlm_req(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len)
static void ieee80211_process_neg_ttlm_req(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt,
size_t len)
{
u8 dialog_token, direction[IEEE80211_TTLM_MAX_CNT] = {}, i;
size_t ies_len;
@@ -8244,8 +8245,9 @@ out:
ieee80211_send_neg_ttlm_res(sdata, ttlm_res, dialog_token, &neg_ttlm);
}
void ieee80211_process_neg_ttlm_res(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len)
static void ieee80211_process_neg_ttlm_res(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt,
size_t len)
{
if (!ieee80211_vif_is_mld(&sdata->vif) ||
mgmt->u.action.ttlm_res.dialog_token != sdata->u.mgd.dialog_token_alloc)
@@ -8266,7 +8268,7 @@ void ieee80211_process_neg_ttlm_res(struct ieee80211_sub_if_data *sdata,
__ieee80211_disconnect(sdata);
}
void ieee80211_process_ttlm_teardown(struct ieee80211_sub_if_data *sdata)
static void ieee80211_process_ttlm_teardown(struct ieee80211_sub_if_data *sdata)
{
u16 new_dormant_links;
@@ -8324,8 +8326,8 @@ void ieee80211_send_teardown_neg_ttlm(struct ieee80211_vif *vif)
}
EXPORT_SYMBOL(ieee80211_send_teardown_neg_ttlm);
void ieee80211_sta_rx_queued_ext(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb)
static void ieee80211_sta_rx_queued_ext(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb)
{
struct ieee80211_link_data *link = &sdata->deflink;
struct ieee80211_rx_status *rx_status;
@@ -8345,129 +8347,6 @@ void ieee80211_sta_rx_queued_ext(struct ieee80211_sub_if_data *sdata,
}
}
void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb)
{
struct ieee80211_link_data *link = &sdata->deflink;
struct ieee80211_rx_status *rx_status;
struct ieee802_11_elems *elems;
struct ieee80211_mgmt *mgmt;
u16 fc;
int ies_len;
lockdep_assert_wiphy(sdata->local->hw.wiphy);
rx_status = (struct ieee80211_rx_status *) skb->cb;
mgmt = (struct ieee80211_mgmt *) skb->data;
fc = le16_to_cpu(mgmt->frame_control);
if (rx_status->link_valid) {
link = sdata_dereference(sdata->link[rx_status->link_id],
sdata);
if (!link)
return;
}
switch (fc & IEEE80211_FCTL_STYPE) {
case IEEE80211_STYPE_BEACON:
ieee80211_rx_mgmt_beacon(link, (void *)mgmt,
skb->len, rx_status);
break;
case IEEE80211_STYPE_PROBE_RESP:
ieee80211_rx_mgmt_probe_resp(link, skb);
break;
case IEEE80211_STYPE_AUTH:
ieee80211_rx_mgmt_auth(sdata, mgmt, skb->len);
break;
case IEEE80211_STYPE_DEAUTH:
ieee80211_rx_mgmt_deauth(sdata, mgmt, skb->len);
break;
case IEEE80211_STYPE_DISASSOC:
ieee80211_rx_mgmt_disassoc(sdata, mgmt, skb->len);
break;
case IEEE80211_STYPE_ASSOC_RESP:
case IEEE80211_STYPE_REASSOC_RESP:
ieee80211_rx_mgmt_assoc_resp(sdata, mgmt, skb->len);
break;
case IEEE80211_STYPE_ACTION:
if (!sdata->u.mgd.associated ||
!ether_addr_equal(mgmt->bssid, sdata->vif.cfg.ap_addr))
break;
switch (mgmt->u.action.category) {
case WLAN_CATEGORY_SPECTRUM_MGMT:
ies_len = skb->len -
offsetof(struct ieee80211_mgmt,
u.action.chan_switch.variable);
if (ies_len < 0)
break;
/* CSA IE cannot be overridden, no need for BSSID */
elems = ieee802_11_parse_elems(mgmt->u.action.chan_switch.variable,
ies_len,
IEEE80211_FTYPE_MGMT |
IEEE80211_STYPE_ACTION,
NULL);
if (elems && !elems->parse_error) {
enum ieee80211_csa_source src =
IEEE80211_CSA_SOURCE_PROT_ACTION;
ieee80211_sta_process_chanswitch(link,
rx_status->mactime,
rx_status->device_timestamp,
elems, elems,
src);
}
kfree(elems);
break;
case WLAN_CATEGORY_PUBLIC:
case WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION:
ies_len = skb->len -
offsetof(struct ieee80211_mgmt,
u.action.ext_chan_switch.variable);
if (ies_len < 0)
break;
/*
* extended CSA IE can't be overridden, no need for
* BSSID
*/
elems = ieee802_11_parse_elems(mgmt->u.action.ext_chan_switch.variable,
ies_len,
IEEE80211_FTYPE_MGMT |
IEEE80211_STYPE_ACTION,
NULL);
if (elems && !elems->parse_error) {
enum ieee80211_csa_source src;
if (mgmt->u.action.category ==
WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION)
src = IEEE80211_CSA_SOURCE_PROT_ACTION;
else
src = IEEE80211_CSA_SOURCE_UNPROT_ACTION;
/* for the handling code pretend it was an IE */
elems->ext_chansw_ie =
&mgmt->u.action.ext_chan_switch.data;
ieee80211_sta_process_chanswitch(link,
rx_status->mactime,
rx_status->device_timestamp,
elems, elems,
src);
}
kfree(elems);
break;
}
break;
}
}
static void ieee80211_sta_timer(struct timer_list *t)
{
struct ieee80211_sub_if_data *sdata =
@@ -10432,8 +10311,9 @@ void ieee80211_disable_rssi_reports(struct ieee80211_vif *vif)
}
EXPORT_SYMBOL(ieee80211_disable_rssi_reports);
void ieee80211_process_ml_reconf_resp(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len)
static void
ieee80211_process_ml_reconf_resp(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len)
{
struct ieee80211_local *local = sdata->local;
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
@@ -11256,8 +11136,9 @@ static void ieee80211_ml_epcs(struct ieee80211_sub_if_data *sdata,
}
}
void ieee80211_process_epcs_ena_resp(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len)
static void ieee80211_process_epcs_ena_resp(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt,
size_t len)
{
struct ieee802_11_elems *elems __free(kfree) = NULL;
size_t ies_len;
@@ -11304,8 +11185,9 @@ void ieee80211_process_epcs_ena_resp(struct ieee80211_sub_if_data *sdata,
ieee80211_epcs_changed(sdata, true);
}
void ieee80211_process_epcs_teardown(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len)
static void ieee80211_process_epcs_teardown(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt,
size_t len)
{
if (!ieee80211_vif_is_mld(&sdata->vif) ||
!sdata->u.mgd.epcs.enabled)
@@ -11314,3 +11196,161 @@ void ieee80211_process_epcs_teardown(struct ieee80211_sub_if_data *sdata,
ieee80211_epcs_teardown(sdata);
ieee80211_epcs_changed(sdata, false);
}
void ieee80211_sta_rx_queued_frame(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb)
{
struct ieee80211_link_data *link = &sdata->deflink;
struct ieee80211_rx_status *rx_status;
struct ieee802_11_elems *elems;
struct ieee80211_mgmt *mgmt;
u16 fc;
int ies_len;
lockdep_assert_wiphy(sdata->local->hw.wiphy);
mgmt = (struct ieee80211_mgmt *) skb->data;
if (ieee80211_is_ext(mgmt->frame_control)) {
ieee80211_sta_rx_queued_ext(sdata, skb);
return;
}
rx_status = (struct ieee80211_rx_status *) skb->cb;
fc = le16_to_cpu(mgmt->frame_control);
if (rx_status->link_valid) {
link = sdata_dereference(sdata->link[rx_status->link_id],
sdata);
if (!link)
return;
}
switch (fc & IEEE80211_FCTL_STYPE) {
case IEEE80211_STYPE_BEACON:
ieee80211_rx_mgmt_beacon(link, (void *)mgmt,
skb->len, rx_status);
break;
case IEEE80211_STYPE_PROBE_RESP:
ieee80211_rx_mgmt_probe_resp(link, skb);
break;
case IEEE80211_STYPE_AUTH:
ieee80211_rx_mgmt_auth(sdata, mgmt, skb->len);
break;
case IEEE80211_STYPE_DEAUTH:
ieee80211_rx_mgmt_deauth(sdata, mgmt, skb->len);
break;
case IEEE80211_STYPE_DISASSOC:
ieee80211_rx_mgmt_disassoc(sdata, mgmt, skb->len);
break;
case IEEE80211_STYPE_ASSOC_RESP:
case IEEE80211_STYPE_REASSOC_RESP:
ieee80211_rx_mgmt_assoc_resp(sdata, mgmt, skb->len);
break;
case IEEE80211_STYPE_ACTION:
if (!sdata->u.mgd.associated ||
!ether_addr_equal(mgmt->bssid, sdata->vif.cfg.ap_addr))
break;
switch (mgmt->u.action.category) {
case WLAN_CATEGORY_SPECTRUM_MGMT:
ies_len = skb->len -
offsetof(struct ieee80211_mgmt,
u.action.chan_switch.variable);
if (ies_len < 0)
break;
/* CSA IE cannot be overridden, no need for BSSID */
elems = ieee802_11_parse_elems(mgmt->u.action.chan_switch.variable,
ies_len,
IEEE80211_FTYPE_MGMT |
IEEE80211_STYPE_ACTION,
NULL);
if (elems && !elems->parse_error) {
enum ieee80211_csa_source src =
IEEE80211_CSA_SOURCE_PROT_ACTION;
ieee80211_sta_process_chanswitch(link,
rx_status->mactime,
rx_status->device_timestamp,
elems, elems,
src);
}
kfree(elems);
break;
case WLAN_CATEGORY_PUBLIC:
case WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION:
ies_len = skb->len -
offsetof(struct ieee80211_mgmt,
u.action.ext_chan_switch.variable);
if (ies_len < 0)
break;
/*
* extended CSA IE can't be overridden, no need for
* BSSID
*/
elems = ieee802_11_parse_elems(mgmt->u.action.ext_chan_switch.variable,
ies_len,
IEEE80211_FTYPE_MGMT |
IEEE80211_STYPE_ACTION,
NULL);
if (elems && !elems->parse_error) {
enum ieee80211_csa_source src;
if (mgmt->u.action.category ==
WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION)
src = IEEE80211_CSA_SOURCE_PROT_ACTION;
else
src = IEEE80211_CSA_SOURCE_UNPROT_ACTION;
/* for the handling code pretend it was an IE */
elems->ext_chansw_ie =
&mgmt->u.action.ext_chan_switch.data;
ieee80211_sta_process_chanswitch(link,
rx_status->mactime,
rx_status->device_timestamp,
elems, elems,
src);
}
kfree(elems);
break;
case WLAN_CATEGORY_PROTECTED_EHT:
switch (mgmt->u.action.action_code) {
case WLAN_PROTECTED_EHT_ACTION_TTLM_REQ:
ieee80211_process_neg_ttlm_req(sdata, mgmt,
skb->len);
break;
case WLAN_PROTECTED_EHT_ACTION_TTLM_RES:
ieee80211_process_neg_ttlm_res(sdata, mgmt,
skb->len);
break;
case WLAN_PROTECTED_EHT_ACTION_TTLM_TEARDOWN:
ieee80211_process_ttlm_teardown(sdata);
break;
case WLAN_PROTECTED_EHT_ACTION_LINK_RECONFIG_RESP:
ieee80211_process_ml_reconf_resp(sdata, mgmt,
skb->len);
break;
case WLAN_PROTECTED_EHT_ACTION_EPCS_ENABLE_RESP:
ieee80211_process_epcs_ena_resp(sdata, mgmt,
skb->len);
break;
case WLAN_PROTECTED_EHT_ACTION_EPCS_ENABLE_TEARDOWN:
ieee80211_process_epcs_teardown(sdata, mgmt,
skb->len);
break;
default:
break;
}
break;
}
break;
}
}