wifi: iwlwifi: mvm: rename BTM support flag and its TLV

Currently, we only need to support BTM rejection.
However, in the future we might want to support other BTM modes.
Rephrase its naming.

Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230613155501.ad20f10668d1.Icbb3fbae50b2302b97225b183dd336b02a4f37ee@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h b/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
index 37ac2364e71451358842daf9be3f5f814d4a2299..380eeb2363c757de40c77f3673628e9781dedd3c 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h
@@ -47,14 +47,14 @@ struct iwl_d3_manager_config {
  * @IWL_D3_PROTO_OFFLOAD_NS: NS (Neighbor Solicitation) is enabled
  * @IWL_D3_PROTO_IPV4_VALID: IPv4 data is valid
  * @IWL_D3_PROTO_IPV6_VALID: IPv6 data is valid
- * @IWL_D3_PROTO_REJECT_BTM: reject BTM request
+ * @IWL_D3_PROTO_OFFLOAD_BTM: BTM offload is enabled
  */
 enum iwl_proto_offloads {
        IWL_D3_PROTO_OFFLOAD_ARP = BIT(0),
        IWL_D3_PROTO_OFFLOAD_NS = BIT(1),
        IWL_D3_PROTO_IPV4_VALID = BIT(2),
        IWL_D3_PROTO_IPV6_VALID = BIT(3),
-       IWL_D3_PROTO_REJECT_BTM = BIT(4),
+       IWL_D3_PROTO_OFFLOAD_BTM = BIT(4),
 };
 
 #define IWL_PROTO_OFFLOAD_NUM_IPV6_ADDRS_V1    2

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h
index 1a4f7c04ebae89387a467dc862582313c39b57b7..b36e9613a52c8cd65177da90facf5b3410c239ba 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/file.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h
@@ -465,7 +465,7 @@ enum iwl_ucode_tlv_capa {
        IWL_UCODE_TLV_CAPA_MLD_API_SUPPORT              = (__force iwl_ucode_tlv_capa_t)110,
        IWL_UCODE_TLV_CAPA_SCAN_DONT_TOGGLE_ANT         = (__force iwl_ucode_tlv_capa_t)111,
        IWL_UCODE_TLV_CAPA_PPAG_CHINA_BIOS_SUPPORT      = (__force iwl_ucode_tlv_capa_t)112,
-       IWL_UCODE_TLV_CAPA_OFFLOAD_REJ_BTM_SUPPORT      = (__force iwl_ucode_tlv_capa_t)113,
+       IWL_UCODE_TLV_CAPA_OFFLOAD_BTM_SUPPORT          = (__force iwl_ucode_tlv_capa_t)113,
        IWL_UCODE_TLV_CAPA_STA_EXP_MFP_SUPPORT          = (__force iwl_ucode_tlv_capa_t)114,
        IWL_UCODE_TLV_CAPA_SNIFF_VALIDATE_SUPPORT       = (__force iwl_ucode_tlv_capa_t)116,
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/offloading.c b/drivers/net/wireless/intel/iwlwifi/mvm/offloading.c
index 797b1f70937eb805e88911f7fdff4c1cb69f7e81..dfb16ca5b4388e38355b4adcd0e63e3d58853b67 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/offloading.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/offloading.c
@@ -199,8 +199,8 @@ int iwl_mvm_send_proto_offload(struct iwl_mvm *mvm,
        }
 
        if (fw_has_capa(&mvm->fw->ucode_capa,
-                       IWL_UCODE_TLV_CAPA_OFFLOAD_REJ_BTM_SUPPORT))
-               enabled |= IWL_D3_PROTO_REJECT_BTM;
+                       IWL_UCODE_TLV_CAPA_OFFLOAD_BTM_SUPPORT))
+               enabled |= IWL_D3_PROTO_OFFLOAD_BTM;
 
        if (!disable_offloading)
                common->enabled = cpu_to_le32(enabled);