Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86052a77 authored by Assaf Krauss's avatar Assaf Krauss Committed by Johannes Berg
Browse files

iwlwifi: remove MFP Kconfig option 



Remove the Kconfig option CONFIG_IWLWIFI_EXPERIMENTAL_MFP,
if the firmware doesn't support MFP then the user shouldn't
have the option to enable it as it won't work correctly.

Signed-off-by: default avatarAssaf Krauss <assaf.krauss@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6c3fd3f0

drivers/net/wireless/iwlwifi/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -133,12 +133,3 @@ config IWLWIFI_P2P 
	  support when it is loaded.



	  Say Y only if you want to experiment with P2P.
 


config IWLWIFI_EXPERIMENTAL_MFP

	bool "support MFP (802.11w) even if uCode doesn't advertise"

	depends on IWLWIFI

	help

	  This option enables experimental MFP (802.11W) support

	  even if the microcode doesn't advertise it.



	  Say Y only if you want to experiment with MFP.

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+0 −2
Original line number Diff line number Diff line
@@ -168,10 +168,8 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, 
		hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |

			     IEEE80211_HW_SUPPORTS_STATIC_SMPS;



#ifndef CONFIG_IWLWIFI_EXPERIMENTAL_MFP

	/* enable 11w if the uCode advertise */

	if (capa->flags & IWL_UCODE_TLV_FLAGS_MFP)

#endif /* !CONFIG_IWLWIFI_EXPERIMENTAL_MFP */

		hw->flags |= IEEE80211_HW_MFP_CAPABLE;



	hw->sta_data_size = sizeof(struct iwl_station_priv);