TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: ipa3: Fix to reset TX/RX prop with correct size"

Browse Source
This commit is contained in:
qctecmdr
2020-04-22 22:25:52 -07:00
committed by Gerrit - the friendly Code Review server
parent 3e5f116c9a 7177a66e65
commit 4cb0ccedfb
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/platform/msm/ipa/ipa_clients/ipa_wdi3.c
View File

@@ -254,7 +254,7 @@ int ipa_wdi_reg_intf(struct ipa_wdi_reg_intf_in_params *in)
goto fail_commit_hdr; goto fail_commit_hdr;
} }
tx.num_props = 2; tx.num_props = 2;
memset(tx_prop, 0, sizeof(*tx_prop)); memset(tx_prop, 0, sizeof(*tx_prop) * IPA_TX_MAX_INTF_PROP);
tx.prop = tx_prop; tx.prop = tx_prop;
tx_prop[0].ip = IPA_IP_v4; tx_prop[0].ip = IPA_IP_v4;
@@ -286,7 +286,7 @@ int ipa_wdi_reg_intf(struct ipa_wdi_reg_intf_in_params *in)
goto fail_commit_hdr; goto fail_commit_hdr;
} }
rx.num_props = 2; rx.num_props = 2;
memset(rx_prop, 0, sizeof(*rx_prop)); memset(rx_prop, 0, sizeof(*rx_prop) * IPA_RX_MAX_INTF_PROP);
rx.prop = rx_prop; rx.prop = rx_prop;
rx_prop[0].ip = IPA_IP_v4; rx_prop[0].ip = IPA_IP_v4;
if (!ipa3_ctx->ipa_wdi3_over_gsi) if (!ipa3_ctx->ipa_wdi3_over_gsi)

3
drivers/platform/msm/ipa/ipa_v3/ipa_intf.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved. * Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
*/ */
#include <linux/fs.h> #include <linux/fs.h>
@@ -114,6 +114,7 @@ int ipa3_register_intf_ext(const char *name, const struct ipa_tx_intf *tx,
kfree(intf); kfree(intf);
return -ENOMEM; return -ENOMEM;
} }
memcpy(intf->tx, tx->prop, len);
} }
if (rx) { if (rx) {