diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-05-26 13:11:44 +0200 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2017-06-29 13:26:25 +0300 |
| commit | 91109f42d0ad0c0c282d1fa1257a1548977aa895 (patch) | |
| tree | d833374f143d0c77e6ca76cf834f8aeb5b353839 /drivers | |
| parent | 4e37b063ad9f902052903c579b6f291ba329104e (diff) | |
| download | linux-stable-91109f42d0ad0c0c282d1fa1257a1548977aa895.tar.gz linux-stable-91109f42d0ad0c0c282d1fa1257a1548977aa895.tar.bz2 linux-stable-91109f42d0ad0c0c282d1fa1257a1548977aa895.zip | |
iwlwifi: mvm: use proper CDB check in PHY context modify
When the firmware supports CDB, PHY contexts cannot be modified to
change their band, but need to be added/remove instead. Instead of
relying on iwl_mvm_has_new_tx_api(), check the right FW capa flag
IWL_UCODE_TLV_CAPA_BINDING_CDB_SUPPORT and remove the comment.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c index d59efe804356..fb9eaf003ea5 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c @@ -255,8 +255,8 @@ int iwl_mvm_phy_ctxt_changed(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt, lockdep_assert_held(&mvm->mutex); - /* In CDB mode we cannot modify PHY context between bands so... */ - if (iwl_mvm_has_new_tx_api(mvm) && + if (fw_has_capa(&mvm->fw->ucode_capa, + IWL_UCODE_TLV_CAPA_BINDING_CDB_SUPPORT) && ctxt->channel->band != chandef->chan->band) { int ret; |