wifi: mac80211: fix decap offload for stations on AP_VLAN interfaces
PATCH 1/1 wifi: mac80211: fix decap offload for stations on AP_VLAN interfaces
Since AP_VLAN interfaces are not passed to the driver, check offload_flags on the bss vif instead.
Reported-by Howard Hsu <[email protected]>
Fixes 80a915ec4427 ("mac80211: add rx decapsulation offload support")
Signed-off-by Felix Fietkau <[email protected]>
--- net/mac80211/rx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/mac80211/rx.c +4 -3
@@ -4340,6 +4340,7 @@ void ieee80211_check_fast_rx(struct sta_info *sta) .vif_type = sdata->vif.type, .control_port_protocol = sdata->control_port_protocol, }, *old, *new = NULL; +u32 offload_flags;bool set_offload = false;bool assign = false;bool offload;
@@ -4455,10 +4456,10 @@ void ieee80211_check_fast_rx(struct sta_info *sta)if (assign) new =kmemdup (&fastrx,sizeof (fastrx),GFP_KERNEL ); - offload = assign && - (sdata->vif.offload_flags &IEEE80211_OFFLOAD_DECAP_ENABLED ); + offload_flags =get_bss_sdata (sdata)->vif.offload_flags; + offload = offload_flags &IEEE80211_OFFLOAD_DECAP_ENABLED ; -if (offload) +if (assign && offload) set_offload = !test_and_set_sta_flag (sta,WLAN_STA_DECAP_OFFLOAD );else set_offload =test_and_clear_sta_flag (sta,WLAN_STA_DECAP_OFFLOAD );
Signature · 1 line
2.36.1