diff options
author | Reinette Chatre <reinette.chatre@intel.com> | 2010-02-25 13:02:19 -0500 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-09 19:16:04 -0500 |
commit | 1382c71c764540880d35485b033a44ce104d8e2e (patch) | |
tree | 6d8502a77b6305d7c2a05c21593e336b35a86aa7 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | 1d79e53c56afe0826a311c3bc1653ad938166c22 (diff) |
Revert "iwlwifi: Send broadcast probe request only when asked to"
This reverts commit 21b2d8bd2f0d4e0f21ade147fd193c8b9c1fd2b9.
As explained by Johannes:
When we
build a probe request frame in the buffer with the SSID, we could
arrive over the limit of 200 bytes. When we build it in the buffer
without the SSID (wildcard) we don't arrive over 200 bytes, but the
ucode still allows direct probe in addition because it has an internal
buffer that is larger when it inserts the SSID...
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 47b021477967..818367b57bab 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -2653,7 +2653,7 @@ static int iwl_mac_setup_register(struct iwl_priv *priv) | |||
2653 | */ | 2653 | */ |
2654 | hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; | 2654 | hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; |
2655 | 2655 | ||
2656 | hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX + 1; | 2656 | hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX; |
2657 | /* we create the 802.11 header and a zero-length SSID element */ | 2657 | /* we create the 802.11 header and a zero-length SSID element */ |
2658 | hw->wiphy->max_scan_ie_len = IWL_MAX_PROBE_REQUEST - 24 - 2; | 2658 | hw->wiphy->max_scan_ie_len = IWL_MAX_PROBE_REQUEST - 24 - 2; |
2659 | 2659 | ||