From: Alex Elder Date: Thu, 27 Oct 2022 12:26:27 +0000 (-0500) Subject: net: ipa: change an IPA v5.0 memory requirement X-Git-Tag: v6.2-rc1~99^2~339^2~5 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5ba5faa2e271bbb8c6e4c48c814f5277c8c014c6;p=tomoyo%2Ftomoyo-test1.git net: ipa: change an IPA v5.0 memory requirement Don't require IPA v5.0 to have a STATS_TETHERING memory region. Downstream defines its size to 0, so it apparently is unused. Signed-off-by: Alex Elder Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/ipa/ipa_mem.c b/drivers/net/ipa/ipa_mem.c index cb9540201839..9ec5af323f73 100644 --- a/drivers/net/ipa/ipa_mem.c +++ b/drivers/net/ipa/ipa_mem.c @@ -198,9 +198,12 @@ static bool ipa_mem_id_required(struct ipa *ipa, enum ipa_mem_id mem_id) case IPA_MEM_PDN_CONFIG: case IPA_MEM_STATS_QUOTA_MODEM: - case IPA_MEM_STATS_TETHERING: return ipa->version >= IPA_VERSION_4_0; + case IPA_MEM_STATS_TETHERING: + return ipa->version >= IPA_VERSION_4_0 && + ipa->version != IPA_VERSION_5_0; + default: return false; /* Anything else is optional */ }