Commit a23c0af1 authored by Benjamin Berg's avatar Benjamin Berg Committed by Johannes Berg
Browse files

wifi: iwlwifi: do not announce EPCS support 



mac80211 does not have proper support for EPCS currently as that would
require changing the ECDA parameters if EPCS (Emergency Preparedness
Communications Service) is in use. As such, do not announce support for
it in the capabilities.

Signed-off-by: default avatarBenjamin Berg <benjamin.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240201155157.59d71656addc.Idde91b3018239c49fc6ed231b411d05354fb9fb1@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 16867c38

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+1 −4
Original line number Diff line number Diff line
@@ -668,7 +668,6 @@ static const struct ieee80211_sband_iftype_data iwl_he_eht_capa[] = { 
			.has_eht = true,

			.eht_cap_elem = {

				.mac_cap_info[0] =

					IEEE80211_EHT_MAC_CAP0_EPCS_PRIO_ACCESS |

					IEEE80211_EHT_MAC_CAP0_OM_CONTROL |

					IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE1 |

					IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE2 |
@@ -793,7 +792,6 @@ static const struct ieee80211_sband_iftype_data iwl_he_eht_capa[] = { 
			.has_eht = true,

			.eht_cap_elem = {

				.mac_cap_info[0] =

					IEEE80211_EHT_MAC_CAP0_EPCS_PRIO_ACCESS |

					IEEE80211_EHT_MAC_CAP0_OM_CONTROL |

					IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE1 |

					IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE2,
@@ -1020,8 +1018,7 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans, 
	if (CSR_HW_REV_TYPE(trans->hw_rev) == IWL_CFG_MAC_TYPE_GL &&

	    iftype_data->eht_cap.has_eht) {

		iftype_data->eht_cap.eht_cap_elem.mac_cap_info[0] &=

			~(IEEE80211_EHT_MAC_CAP0_EPCS_PRIO_ACCESS |

			  IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE1 |

			~(IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE1 |

			  IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE2);

		iftype_data->eht_cap.eht_cap_elem.phy_cap_info[3] &=

			~(IEEE80211_EHT_PHY_CAP0_PARTIAL_BW_UL_MU_MIMO |