wifi: iwlwifi: mvm: mark bad no-data RX as having bad PLCP

Just like with any other frame, mac80211 will do sanity checks
on no-data RX (representing e.g. sounding PPDUs), and if e.g.
the NSS is wrong, it will warn. This isn't a good idea if we
already know the frame wasn't received well, e.g. has bad PLCP.
Unless the firmware reports "no error", set the bad PLCP flag
to skip checks in mac80211.

Also, since we're now extracting two different values from the
info field, use le32_get_bits() for both.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240512072733.e6adcb9a6ece.Ic14c2e8ed5e80d48af78b2f04e9f08beeb62d68e@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index 8bbef4454399f3d2954dbee16053442fbe25be00..2f9e2254fb4675f131ce619f1de82851559e8372 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -2361,7 +2361,6 @@ void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,
        struct iwl_rx_packet *pkt = rxb_addr(rxb);
        struct iwl_rx_no_data_ver_3 *desc = (void *)pkt->data;
        u32 rssi;
-       u32 info_type;
        struct ieee80211_sta *sta = NULL;
        struct sk_buff *skb;
        struct iwl_mvm_rx_phy_data phy_data;
@@ -2374,7 +2373,6 @@ void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,
                return;
 
        rssi = le32_to_cpu(desc->rssi);
-       info_type = le32_to_cpu(desc->info) & RX_NO_DATA_INFO_TYPE_MSK;
        phy_data.d0 = desc->phy_info[0];
        phy_data.d1 = desc->phy_info[1];
        phy_data.phy_info = IWL_RX_MPDU_PHY_TSF_OVERLOAD;
@@ -2426,7 +2424,12 @@ void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,
        /* 0-length PSDU */
        rx_status->flag |= RX_FLAG_NO_PSDU;
 
-       switch (info_type) {
+       /* mark as failed PLCP on any errors to skip checks in mac80211 */
+       if (le32_get_bits(desc->info, RX_NO_DATA_INFO_ERR_MSK) !=
+           RX_NO_DATA_INFO_ERR_NONE)
+               rx_status->flag |= RX_FLAG_FAILED_PLCP_CRC;
+
+       switch (le32_get_bits(desc->info, RX_NO_DATA_INFO_TYPE_MSK)) {
        case RX_NO_DATA_INFO_TYPE_NDP:
                rx_status->zero_length_psdu_type =
                        IEEE80211_RADIOTAP_ZERO_LEN_PSDU_SOUNDING;