diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-24 21:55:26 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-24 21:55:26 -0800 |
| commit | 5d7b045b73f4ce9fe53eb1b4fc219e141d0fdc6a (patch) | |
| tree | eb43fc821be91ad9c8ec40520f463e0c6f207cf0 /drivers/net/wireless/iwlwifi/iwl-fw-file.h | |
| parent | 9143e398a443d104d0c1247a3049ccdeb9b7f192 (diff) | |
| parent | e3f31175a3eeb492a6ab788e4fa136c19b43aab4 (diff) | |
| download | talos-op-linux-5d7b045b73f4ce9fe53eb1b4fc219e141d0fdc6a.tar.gz talos-op-linux-5d7b045b73f4ce9fe53eb1b4fc219e141d0fdc6a.zip | |
Merge tag 'wireless-drivers-for-davem-2015-01-20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
ath9k:
* fix an IRQ storm caused by commit 872b5d814f99
iwlwifi:
* A fix for scan that fixes a firmware assertion
* A fix that improves roaming behavior. Same fix has been tested for
a while in iwldvm. This is a bit of a work around, but the real fix
should be in mac80211 and will come later.
* A fix for BARs that avoids a WARNING.
* one fix for rfkill while scheduled scan is running.
Linus's system hit this issue. WiFi would be unavailable
after this has happpened because of bad state in cfg80211.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-fw-file.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-file.h b/drivers/net/wireless/iwlwifi/iwl-fw-file.h index 1bbe4fc47b97..660ddb1b7d8a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fw-file.h +++ b/drivers/net/wireless/iwlwifi/iwl-fw-file.h @@ -246,6 +246,7 @@ enum iwl_ucode_tlv_flag { * @IWL_UCODE_TLV_API_BASIC_DWELL: use only basic dwell time in scan command, * regardless of the band or the number of the probes. FW will calculate * the actual dwell time. + * @IWL_UCODE_TLV_API_SINGLE_SCAN_EBS: EBS is supported for single scans too. */ enum iwl_ucode_tlv_api { IWL_UCODE_TLV_API_WOWLAN_CONFIG_TID = BIT(0), @@ -257,6 +258,7 @@ enum iwl_ucode_tlv_api { IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF = BIT(7), IWL_UCODE_TLV_API_FRAGMENTED_SCAN = BIT(8), IWL_UCODE_TLV_API_BASIC_DWELL = BIT(13), + IWL_UCODE_TLV_API_SINGLE_SCAN_EBS = BIT(16), }; /** |
