diff mbox series

[v2,1/2] Revert "wifi: rtl8xxxu: enable MFP support"

Message ID 20240418071813.1883174-2-martin.kaistra@linutronix.de
State New
Headers show
Series wifi: rtl8xxxu: WPA3 support | expand

Commit Message

Martin Kaistra April 18, 2024, 7:18 a.m. UTC 
This reverts commit 77f5924fc41c243e907c80ce2576902d3a9cb336.

There is a more elegant solution to check for not decrypted frames,
which is to check the security flag in the RX descriptor.

Revert commit 77f5924fc41c ("wifi: rtl8xxxu: enable MFP support") in
favor of this to be able to send it to stable.

Signed-off-by: Martin Kaistra <martin.kaistra@linutronix.de>
---
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

Comments

Ping-Ke Shih April 22, 2024, 1:55 a.m. UTC | #1 
Martin Kaistra <martin.kaistra@linutronix.de> wrote:

> This reverts commit 77f5924fc41c243e907c80ce2576902d3a9cb336.
> 
> There is a more elegant solution to check for not decrypted frames,
> which is to check the security flag in the RX descriptor.
> 
> Revert commit 77f5924fc41c ("wifi: rtl8xxxu: enable MFP support") in
> favor of this to be able to send it to stable.
> 
> Signed-off-by: Martin Kaistra <martin.kaistra@linutronix.de>

2 patch(es) applied to rtw-next branch of rtw.git, thanks.

55e2843dd33a Revert "wifi: rtl8xxxu: enable MFP support"
cbfbb4ddbc85 wifi: rtl8xxxu: enable MFP support with security flag of RX descriptor

---
https://github.com/pkshih/rtw.git
diff mbox series

Patch

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index 870bd952f5902..4a49f8f9d80f2 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -6473,9 +6473,7 @@  int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb)
 			rx_status->mactime = rx_desc->tsfl;
 			rx_status->flag |= RX_FLAG_MACTIME_START;
 
-			if (!rx_desc->swdec &&
-			    !(_ieee80211_is_robust_mgmt_frame(hdr) &&
-			      ieee80211_has_protected(hdr->frame_control)))
+			if (!rx_desc->swdec)
 				rx_status->flag |= RX_FLAG_DECRYPTED;
 			if (rx_desc->crc32)
 				rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
@@ -6580,9 +6578,7 @@  int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv *priv, struct sk_buff *skb)
 			rx_status->mactime = rx_desc->tsfl;
 			rx_status->flag |= RX_FLAG_MACTIME_START;
 
-			if (!rx_desc->swdec &&
-			    !(_ieee80211_is_robust_mgmt_frame(hdr) &&
-			      ieee80211_has_protected(hdr->frame_control)))
+			if (!rx_desc->swdec)
 				rx_status->flag |= RX_FLAG_DECRYPTED;
 			if (rx_desc->crc32)
 				rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
@@ -8002,7 +7998,6 @@  static int rtl8xxxu_probe(struct usb_interface *interface,
 	ieee80211_hw_set(hw, HAS_RATE_CONTROL);
 	ieee80211_hw_set(hw, SUPPORT_FAST_XMIT);
 	ieee80211_hw_set(hw, AMPDU_AGGREGATION);
-	ieee80211_hw_set(hw, MFP_CAPABLE);
 
 	wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);