diff options
| author | David S. Miller | 2017-08-07 20:34:41 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-08-07 20:37:47 +0200 |
| commit | 46d4b68f891bee5d83a32508bfbd9778be6b1b63 (patch) | |
| tree | 3c05e6c6285102eef6f6756bd692e86ae86f9b30 /drivers/net/wireless/intel/iwlwifi/mvm/scan.c | |
| parent | hns3: fix unused function warning (diff) | |
| parent | rtlwifi: Replace hardcode value with macro (diff) | |
| download | kernel-qcow2-linux-46d4b68f891bee5d83a32508bfbd9778be6b1b63.tar.gz kernel-qcow2-linux-46d4b68f891bee5d83a32508bfbd9778be6b1b63.tar.xz kernel-qcow2-linux-46d4b68f891bee5d83a32508bfbd9778be6b1b63.zip | |
Merge tag 'wireless-drivers-next-for-davem-2017-08-07' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for 4.14
The first wireless-drivers-next pull request for 4.14. I'm submitting
this unusally late in the cycle as my vacation postponed this. But
even if this is late there's not still that much new features, mostly
cleanup or fixes.
Major changes:
ath10k
* preparation for wcn3990 support
iwlwifi
* Reorganization of the code into separate directories continues
qtnfmac
* regulatory support updates
* add get_channel, dump_survey and channel_switch cfg80211 handlers
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/scan.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index 35e813bdfbe5..50983615dce6 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -69,7 +69,7 @@ #include <net/mac80211.h> #include "mvm.h" -#include "fw-api-scan.h" +#include "fw/api/scan.h" #include "iwl-io.h" #define IWL_DENSE_EBS_SCAN_RATIO 5 @@ -743,7 +743,7 @@ static inline bool iwl_mvm_scan_use_ebs(struct iwl_mvm *mvm, * 4. it's not a p2p find operation. */ return ((capa->flags & IWL_UCODE_TLV_FLAGS_EBS_SUPPORT) && - mvm->last_ebs_successful && + mvm->last_ebs_successful && IWL_MVM_ENABLE_EBS && vif->type != NL80211_IFTYPE_P2P_DEVICE); } |