aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-fw.h2
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mac80211.c3
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/power.c3
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h
index 04eac6ed68af..f87ab6928acf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw.h
@@ -79,7 +79,6 @@
79 * offload profile config command. 79 * offload profile config command.
80 * @IWL_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS: D3 image supports up to six 80 * @IWL_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS: D3 image supports up to six
81 * (rather than two) IPv6 addresses 81 * (rather than two) IPv6 addresses
82 * @IWL_UCODE_TLV_FLAGS_BF_UPDATED: new beacon filtering API
83 * @IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID: not sending a probe with the SSID element 82 * @IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID: not sending a probe with the SSID element
84 * from the probe request template. 83 * from the probe request template.
85 * @IWL_UCODE_TLV_FLAGS_D3_CONTINUITY_API: modified D3 API to allow keeping 84 * @IWL_UCODE_TLV_FLAGS_D3_CONTINUITY_API: modified D3 API to allow keeping
@@ -107,7 +106,6 @@ enum iwl_ucode_tlv_flag {
107 IWL_UCODE_TLV_FLAGS_DW_BC_TABLE = BIT(4), 106 IWL_UCODE_TLV_FLAGS_DW_BC_TABLE = BIT(4),
108 IWL_UCODE_TLV_FLAGS_SHORT_BL = BIT(7), 107 IWL_UCODE_TLV_FLAGS_SHORT_BL = BIT(7),
109 IWL_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS = BIT(10), 108 IWL_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS = BIT(10),
110 IWL_UCODE_TLV_FLAGS_BF_UPDATED = BIT(11),
111 IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID = BIT(12), 109 IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID = BIT(12),
112 IWL_UCODE_TLV_FLAGS_D3_CONTINUITY_API = BIT(14), 110 IWL_UCODE_TLV_FLAGS_D3_CONTINUITY_API = BIT(14),
113 IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL = BIT(15), 111 IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL = BIT(15),
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 39e4ffeae22f..c4557225f46e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -824,8 +824,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
824 goto out_remove_mac; 824 goto out_remove_mac;
825 825
826 if (!mvm->bf_allowed_vif && 826 if (!mvm->bf_allowed_vif &&
827 vif->type == NL80211_IFTYPE_STATION && !vif->p2p && 827 vif->type == NL80211_IFTYPE_STATION && !vif->p2p) {
828 mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BF_UPDATED){
829 mvm->bf_allowed_vif = mvmvif; 828 mvm->bf_allowed_vif = mvmvif;
830 vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER | 829 vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER |
831 IEEE80211_VIF_SUPPORTS_CQM_RSSI; 830 IEEE80211_VIF_SUPPORTS_CQM_RSSI;
diff --git a/drivers/net/wireless/iwlwifi/mvm/power.c b/drivers/net/wireless/iwlwifi/mvm/power.c
index ab92a634aded..dba760f24627 100644
--- a/drivers/net/wireless/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/iwlwifi/mvm/power.c
@@ -843,8 +843,7 @@ int iwl_mvm_disable_beacon_filter(struct iwl_mvm *mvm,
843 struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); 843 struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
844 int ret; 844 int ret;
845 845
846 if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BF_UPDATED) || 846 if (vif->type != NL80211_IFTYPE_STATION || vif->p2p)
847 vif->type != NL80211_IFTYPE_STATION || vif->p2p)
848 return 0; 847 return 0;
849 848
850 ret = iwl_mvm_beacon_filter_send_cmd(mvm, &cmd, flags); 849 ret = iwl_mvm_beacon_filter_send_cmd(mvm, &cmd, flags);