diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-08 10:09:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-08 10:09:57 -0700 |
| commit | 91aac5637fc0f1db54edcccfc96a00879ec86411 (patch) | |
| tree | eb4d74aba57032ddab913d44821de75615aeb7f0 /drivers/net/wireless/intel/iwlwifi/mvm/led.c | |
| parent | 7906b00f5cd1cd484fced7fcda892176e3202c8a (diff) | |
| parent | f957dd3c8db2781c8a334b166800788feb618625 (diff) | |
Merge tag 'wireless-drivers-for-davem-2017-09-08' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says:
====================
wireless-drivers fixes for 4.14
Few fixes to regressions introduced in the last one or two releases.
The iwlwifi fix is for a regression reported by Linus.
rtlwifi
* fix two antenna selection related bugs
iwlwifi
* fix regression with older firmwares
brcmfmac
* workaround firmware crash for bcm4345
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/led.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/led.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/led.c b/drivers/net/wireless/intel/iwlwifi/mvm/led.c index 005e2e7278a5..b27269504a62 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/led.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/led.c @@ -92,7 +92,8 @@ static void iwl_mvm_send_led_fw_cmd(struct iwl_mvm *mvm, bool on) static void iwl_mvm_led_set(struct iwl_mvm *mvm, bool on) { - if (mvm->cfg->device_family >= IWL_DEVICE_FAMILY_8000) { + if (fw_has_capa(&mvm->fw->ucode_capa, + IWL_UCODE_TLV_CAPA_LED_CMD_SUPPORT)) { iwl_mvm_send_led_fw_cmd(mvm, on); return; } |