summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>2024-03-07 12:52:13 +0200
committeriwlwifi publisher <>2024-04-17 13:07:07 +0000
commit5c84e777301ee4bd7bd66d5594bbdd72c16e39d5 (patch)
tree0632bed014f9b3223e0f6849cc9f3c049f889899
parentda09dccecd9e5e3e05d45f30a9c53f7e9be62922 (diff)
downloadbackport-iwlwifi-5c84e777301ee4bd7bd66d5594bbdd72c16e39d5.tar.gz
[BUGFIX] wifi: iwlwifi: mvm: fix build when KUnit is not defined
iwl_mvm_mld_valid_link_pair should be static when KUnit is not defined. Add a VISIBLE_IF_IWLWIFI_KUNIT to its implementation. type=bugfix ticket=none fixes=I5baf0c293c89a5a28bd1a6386bf9ca6d2bf61ab8 fixes=I65e4698b730a8652ad8d1c01420aabb41a1d04fd Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Change-Id: I1aeac95a4927fa202b10426959006436909c46d0 Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/98014 automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-by: Johannes Berg <johannes.berg@intel.com> x-iwlwifi-stack-dev: aa5b81844464d212376536f7f9846708d4dd0014
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/link.c1
-rw-r--r--versions2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/link.c b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
index 2243f4ed10..0b425ed814 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/link.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
@@ -628,6 +628,7 @@ iwl_mvm_esr_disallowed_with_link(struct ieee80211_vif *vif,
return ret;
}
+VISIBLE_IF_IWLWIFI_KUNIT
bool iwl_mvm_mld_valid_link_pair(struct ieee80211_vif *vif,
const struct iwl_mvm_link_sel_data *a,
const struct iwl_mvm_link_sel_data *b)
diff --git a/versions b/versions
index 17a3228b55..ede8b3a1b3 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:11986:efc2b70e"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11987:aa5b8184"