android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wil6210: Drop unicast sub frame if part of a multicast amsdu"

Browse Source
This commit is contained in:
qctecmdr 2023-03-22 16:23:53 -07:00 committed by Gerrit - the friendly Code Review server
commit 40bc7a82b7
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/ath/wil6210/txrx_edma.c
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: ISC
/*
* Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
*/
#include <linux/etherdevice.h>
@ -804,9 +804,20 @@ static int wil_check_amsdu(struct wil6210_priv *wil, void *msg, int cid,
switch (vif->wdev.iftype) {
case NL80211_IFTYPE_STATION:
case NL80211_IFTYPE_P2P_CLIENT:
/* check if the MSDU (a sub-frame of AMSDU) is multicast */
if (is_multicast_ether_addr(da))
return 0;
/* check if the current AMSDU (MPDU) frame is a multicast.
* If so we have unicast sub frame as part of a multicast
* AMSDU. Current frame and all sub frames should be dropped.
*/
if (wil_rx_status_get_mcast(msg)) {
wil_dbg_txrx(wil,
"Found unicast sub frame in a multicast mpdu. Drop it\n");
goto out;
}
/* On client side, DA should be the client mac address */
ndev = vif_to_ndev(vif);
if (ether_addr_equal(ndev->dev_addr, da))
@ -827,12 +838,13 @@ static int wil_check_amsdu(struct wil6210_priv *wil, void *msg, int cid,
return 0;
}
out:
sta->amsdu_drop_sn = seq;
sta->amsdu_drop_tid = tid;
sta->amsdu_drop = 1;
wil_dbg_txrx(wil,
"Drop AMSDU frame, sn=%d. Drop this and all next sub frames\n",
seq);
"Drop AMSDU frame, sn=%d tid=%d. Drop this and all next sub frames\n",
seq, tid);
return -EAGAIN;
}

4
drivers/net/wireless/ath/wil6210/txrx_edma.h
View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: ISC */
/*
* Copyright (c) 2012-2016,2018-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2016,2018-2021, The Linux Foundation. All rights reserved.
*/
#ifndef WIL6210_TXRX_EDMA_H
@ -373,7 +373,7 @@ static inline u16 wil_rx_status_get_flow_id(void *msg)
static inline u8 wil_rx_status_get_mcast(void *msg)
{
return WIL_GET_BITS(((struct wil_rx_status_compressed *)msg)->d0,
26, 26);
25, 26);
}
/**