wifi: iwlwifi: mvm: send TKIP connection status to csme

Notify csme when associated with TKIP cipher. TKIP is supported
by csme.

Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20221030191011.cea63e4a355c.If6cdfa52529a79b923191c89dad7ed871d2ad2c6@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h b/drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h
index 67122cfa22920dd3d45833da33c6742793194d3a..bea61c8fb526020f25bda0fa2cf0d47dc86ed4eb 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h
+++ b/drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h
@@ -220,6 +220,7 @@ struct iwl_mei_nvm {
 /**
  * enum iwl_mei_pairwise_cipher - cipher for UCAST key
  * @IWL_MEI_CIPHER_NONE: none
+ * @IWL_MEI_CIPHER_TKIP: tkip
  * @IWL_MEI_CIPHER_CCMP: ccmp
  * @IWL_MEI_CIPHER_GCMP: gcmp
  * @IWL_MEI_CIPHER_GCMP_256: gcmp 256
@@ -228,6 +229,7 @@ struct iwl_mei_nvm {
  */
 enum iwl_mei_pairwise_cipher {
        IWL_MEI_CIPHER_NONE     = 0,
+       IWL_MEI_CIPHER_TKIP     = 2,
        IWL_MEI_CIPHER_CCMP     = 4,
        IWL_MEI_CIPHER_GCMP     = 8,
        IWL_MEI_CIPHER_GCMP_256 = 9,

diff --git a/drivers/net/wireless/intel/iwlwifi/mei/sap.h b/drivers/net/wireless/intel/iwlwifi/mei/sap.h
index be1456dea484820b8a7dc556936f1d78def5b88b..ef2664589fc1efe8c6fa1cc62637aec3534ac247 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mei/sap.h
+++ b/drivers/net/wireless/intel/iwlwifi/mei/sap.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021 - 2022 Intel Corporation
  */
 
 #ifndef __sap_h__
@@ -334,12 +334,14 @@ enum iwl_sap_wifi_auth_type {
 /**
  * enum iwl_sap_wifi_cipher_alg
  * @SAP_WIFI_CIPHER_ALG_NONE: TBD
+ * @SAP_WIFI_CIPHER_ALG_TKIP: TBD
  * @SAP_WIFI_CIPHER_ALG_CCMP: TBD
  * @SAP_WIFI_CIPHER_ALG_GCMP: TBD
  * @SAP_WIFI_CIPHER_ALG_GCMP_256: TBD
  */
 enum iwl_sap_wifi_cipher_alg {
        SAP_WIFI_CIPHER_ALG_NONE        = IWL_MEI_CIPHER_NONE,
+       SAP_WIFI_CIPHER_ALG_TKIP        = IWL_MEI_CIPHER_TKIP,
        SAP_WIFI_CIPHER_ALG_CCMP        = IWL_MEI_CIPHER_CCMP,
        SAP_WIFI_CIPHER_ALG_GCMP        = IWL_MEI_CIPHER_GCMP,
        SAP_WIFI_CIPHER_ALG_GCMP_256    = IWL_MEI_CIPHER_GCMP_256,

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 8464c9b7baf1fe875aa714309909f96018c53f15..156283237e2a8839b95bdd77a14e7d48bbe81abc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -3059,6 +3059,9 @@ static void iwl_mvm_mei_host_associated(struct iwl_mvm *mvm,
                return;
 
        switch (mvm_sta->pairwise_cipher) {
+       case WLAN_CIPHER_SUITE_TKIP:
+               conn_info.pairwise_cipher = IWL_MEI_CIPHER_TKIP;
+               break;
        case WLAN_CIPHER_SUITE_CCMP:
                conn_info.pairwise_cipher = IWL_MEI_CIPHER_CCMP;
                break;