summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvraham Stern <avraham.stern@intel.com>2023-04-17 03:24:48 +0300
committeriwlwifi publisher <>2023-04-17 15:20:00 +0000
commit51d57e7dace118bff61258db56045ac07c230775 (patch)
tree5f0a24058245652ddc6a4633e5afdeee55161209
parent282e7ed0c1dd92c9020189d7bee1a5bf9c0d3f48 (diff)
downloadbackport-iwlwifi-51d57e7dace118bff61258db56045ac07c230775.tar.gz
[BUGFIX] wifi: iwlmei: send driver down SAP message only if wiamt is enabled
When wiamt is disabled the driver up SAP message is not sent, so there is no need to send the driver down message as well. type=bugfix ticket=none fixes=Ibf66e3e248d549166d1eb340c60ee5b2a1dada78 Signed-off-by: Avraham Stern <avraham.stern@intel.com> Change-Id: I583d3e18ea65793f53aa710af13e47f8af82b53d Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/51344 automatic-review: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> tested: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-by: Greenman, Gregory <gregory.greenman@intel.com> x-iwlwifi-stack-dev: 8cf9faf57f99397d256c645edd990b1c3714ce58
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mei/main.c4
-rw-r--r--versions2
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mei/main.c b/drivers/net/wireless/intel/iwlwifi/mei/main.c
index 88b9ec397b..5051ed0fc0 100644
--- a/drivers/net/wireless/intel/iwlwifi/mei/main.c
+++ b/drivers/net/wireless/intel/iwlwifi/mei/main.c
@@ -1833,7 +1833,9 @@ void iwl_mei_unregister_complete(void)
struct iwl_mei *mei =
mei_cldev_get_drvdata(iwl_mei_global_cldev);
- iwl_mei_send_sap_msg(mei->cldev, SAP_MSG_NOTIF_WIFIDR_DOWN);
+ if (mei->amt_enabled)
+ iwl_mei_send_sap_msg(mei->cldev,
+ SAP_MSG_NOTIF_WIFIDR_DOWN);
mei->got_ownership = false;
}
diff --git a/versions b/versions
index 211b60f853..4badd5cba3 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11156:61479a98"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11157:8cf9faf5"