diff options
author | David Spinadel <david.spinadel@intel.com> | 2012-03-07 12:52:31 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-08 13:59:53 -0500 |
commit | 18c57d3c1e31a91a5925da001c19d521178d00bd (patch) | |
tree | ea7b421d5a1aa1ab5de667adbe59efe2bb7c6fd1 /drivers/net/wireless/iwlwifi | |
parent | 8e81f65fdc7f5d292bb3c115b748767d921823c1 (diff) |
iwlwifi: add option to test MFP
Add a Kconfig symbol to enable MFP for testing even
if the firmware file doesn't advertise it.
Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/Kconfig | 9 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-mac80211.c | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig index 5afd06ef0d8b..2fe62730dddd 100644 --- a/drivers/net/wireless/iwlwifi/Kconfig +++ b/drivers/net/wireless/iwlwifi/Kconfig | |||
@@ -127,3 +127,12 @@ config IWLWIFI_P2P | |||
127 | support when it is loaded. | 127 | support when it is loaded. |
128 | 128 | ||
129 | Say Y only if you want to experiment with P2P. | 129 | Say Y only if you want to experiment with P2P. |
130 | |||
131 | config IWLWIFI_EXPERIMENTAL_MFP | ||
132 | bool "support MFP (802.11w) even if uCode doesn't advertise" | ||
133 | depends on IWLWIFI | ||
134 | help | ||
135 | This option enables experimental MFP (802.11W) support | ||
136 | even if the microcode doesn't advertise it. | ||
137 | |||
138 | Say Y only if you want to experiment with MFP. | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c index 91a42c3261aa..dcf39f84f239 100644 --- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c +++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c | |||
@@ -163,7 +163,10 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, | |||
163 | hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS | | 163 | hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS | |
164 | IEEE80211_HW_SUPPORTS_STATIC_SMPS; | 164 | IEEE80211_HW_SUPPORTS_STATIC_SMPS; |
165 | 165 | ||
166 | #ifndef CONFIG_IWLWIFI_EXPERIMENTAL_MFP | ||
167 | /* enable 11w if the uCode advertise */ | ||
166 | if (capa->flags & IWL_UCODE_TLV_FLAGS_MFP) | 168 | if (capa->flags & IWL_UCODE_TLV_FLAGS_MFP) |
169 | #endif /* !CONFIG_IWLWIFI_EXPERIMENTAL_MFP */ | ||
167 | hw->flags |= IEEE80211_HW_MFP_CAPABLE; | 170 | hw->flags |= IEEE80211_HW_MFP_CAPABLE; |
168 | 171 | ||
169 | hw->sta_data_size = sizeof(struct iwl_station_priv); | 172 | hw->sta_data_size = sizeof(struct iwl_station_priv); |