diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-04-29 02:33:10 -0400 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-05-10 18:08:55 -0400 |
commit | dd7a2509b3a79b290730a9c6a784bf03fedabb9a (patch) | |
tree | cf794200c80f5fad44baeda3360dbe305bb7809b /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
parent | 0e9a44dc0bb718c28b20a48f551818036ef090ab (diff) |
iwlagn: implement loading a new firmware file type
The old firmware file type does not allow indicating
any firmware capabilities, which we frequently want
to make things easier.
This implements a new firmware type that is based on
a TLV structure, and adds a TLV for the maximum length
of probe requests in scans.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 59c85f55e625..77ab00b98778 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -3875,6 +3875,8 @@ err: | |||
3875 | return ret; | 3875 | return ret; |
3876 | } | 3876 | } |
3877 | 3877 | ||
3878 | #define IWL3945_MAX_PROBE_REQUEST 200 | ||
3879 | |||
3878 | static int iwl3945_setup_mac(struct iwl_priv *priv) | 3880 | static int iwl3945_setup_mac(struct iwl_priv *priv) |
3879 | { | 3881 | { |
3880 | int ret; | 3882 | int ret; |
@@ -3900,7 +3902,7 @@ static int iwl3945_setup_mac(struct iwl_priv *priv) | |||
3900 | 3902 | ||
3901 | hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945; | 3903 | hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945; |
3902 | /* we create the 802.11 header and a zero-length SSID element */ | 3904 | /* we create the 802.11 header and a zero-length SSID element */ |
3903 | hw->wiphy->max_scan_ie_len = IWL_MAX_PROBE_REQUEST - 24 - 2; | 3905 | hw->wiphy->max_scan_ie_len = IWL3945_MAX_PROBE_REQUEST - 24 - 2; |
3904 | 3906 | ||
3905 | /* Default value; 4 EDCA QOS priorities */ | 3907 | /* Default value; 4 EDCA QOS priorities */ |
3906 | hw->queues = 4; | 3908 | hw->queues = 4; |