diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-05-15 11:53:25 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-05-15 11:53:25 -0700 |
| commit | 1e8fe74573d6119ea3ae0a6de33ddff20cd0802e (patch) | |
| tree | 99cc51f51657b4e6fd7b46c727f742f3adf8ea0a | |
| parent | 919d207f22dae9349989fe76f57015bc337e5dc5 (diff) | |
| parent | df8604942160f958a9030ee6c0fa65117aca41df (diff) | |
Merge "msm: ipa3: Fix to correct mem allocated flag" into kernel.lnx.4.14.r3-relLA.UM.7.9.r1-06100-sm6150.0
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_v3/ipa_nat.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_nat.c b/drivers/platform/msm/ipa/ipa_v3/ipa_nat.c index 1696e71b67ac..b339fef58791 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_nat.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_nat.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1560,7 +1560,6 @@ int ipa3_del_nat_table(struct ipa_ioc_nat_ipv6ct_table_del *del) ipa3_ctx->nat_mem.pdn_mem.base, ipa3_ctx->nat_mem.pdn_mem.phys_base); ipa3_ctx->nat_mem.pdn_mem.base = NULL; - ipa3_ctx->nat_mem.dev.is_mem_allocated = false; } ipa3_nat_ipv6ct_free_mem(&ipa3_ctx->nat_mem.dev); |