diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-mac80211.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-mac80211.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c index d33cc9cc7d3f..ab2f4d7500a4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c +++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c | |||
@@ -150,6 +150,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, | |||
150 | IEEE80211_HW_QUEUE_CONTROL | | 150 | IEEE80211_HW_QUEUE_CONTROL | |
151 | IEEE80211_HW_SUPPORTS_PS | | 151 | IEEE80211_HW_SUPPORTS_PS | |
152 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS | | 152 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS | |
153 | IEEE80211_HW_WANT_MONITOR_VIF | | ||
153 | IEEE80211_HW_SCAN_WHILE_IDLE; | 154 | IEEE80211_HW_SCAN_WHILE_IDLE; |
154 | 155 | ||
155 | hw->offchannel_tx_hw_queue = IWL_AUX_QUEUE; | 156 | hw->offchannel_tx_hw_queue = IWL_AUX_QUEUE; |
@@ -223,8 +224,8 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, | |||
223 | hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; | 224 | hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; |
224 | 225 | ||
225 | hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX; | 226 | hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX; |
226 | /* we create the 802.11 header and a zero-length SSID element */ | 227 | /* we create the 802.11 header and a max-length SSID element */ |
227 | hw->wiphy->max_scan_ie_len = capa->max_probe_length - 24 - 2; | 228 | hw->wiphy->max_scan_ie_len = capa->max_probe_length - 24 - 34; |
228 | 229 | ||
229 | /* | 230 | /* |
230 | * We don't use all queues: 4 and 9 are unused and any | 231 | * We don't use all queues: 4 and 9 are unused and any |