aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-mac80211.c
diff options
context:
space:
mode:
authorDavid Spinadel <david.spinadel@intel.com>2012-03-07 12:52:31 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-03-08 13:59:53 -0500
commit18c57d3c1e31a91a5925da001c19d521178d00bd (patch)
treeea7b421d5a1aa1ab5de667adbe59efe2bb7c6fd1 /drivers/net/wireless/iwlwifi/iwl-mac80211.c
parent8e81f65fdc7f5d292bb3c115b748767d921823c1 (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/iwl-mac80211.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-mac80211.c3
1 files changed, 3 insertions, 0 deletions
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);