Revert "wifi: rtl8xxxu: enable MFP support"

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>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://msgid.link/20240418071813.1883174-2-martin.kaistra@linutronix.de

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index be50e24337aa9325d802d1cd04d1ca1e08d66374..7ad427e430c3ebe80666b4475bde37826ee88176 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -6468,9 +6468,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;
@@ -6575,9 +6573,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;
@@ -7997,7 +7993,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);