diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-11-21 14:38:49 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-11-21 14:38:49 -0500 |
commit | 1e60896fe07307baa5f3ca1a220dfa9792657352 (patch) | |
tree | b68ba91a72b1b421d37914e4201fc672f12d86ae /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
parent | ad66786718989c20c91e855baa40371e01daf0a1 (diff) | |
parent | eea54c8ec971d4759c541dba351477dafc39ce54 (diff) |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/mac80211.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/mac80211.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index bf189f11541..c862c090634 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c | |||
@@ -168,8 +168,13 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, | |||
168 | hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS | | 168 | hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS | |
169 | IEEE80211_HW_SUPPORTS_STATIC_SMPS; | 169 | IEEE80211_HW_SUPPORTS_STATIC_SMPS; |
170 | 170 | ||
171 | /* enable 11w if the uCode advertise */ | 171 | /* |
172 | if (capa->flags & IWL_UCODE_TLV_FLAGS_MFP) | 172 | * Enable 11w if advertised by firmware and software crypto |
173 | * is not enabled (as the firmware will interpret some mgmt | ||
174 | * packets, so enabling it with software crypto isn't safe) | ||
175 | */ | ||
176 | if (priv->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_MFP && | ||
177 | !iwlwifi_mod_params.sw_crypto) | ||
173 | hw->flags |= IEEE80211_HW_MFP_CAPABLE; | 178 | hw->flags |= IEEE80211_HW_MFP_CAPABLE; |
174 | 179 | ||
175 | hw->sta_data_size = sizeof(struct iwl_station_priv); | 180 | hw->sta_data_size = sizeof(struct iwl_station_priv); |