summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmir Levy <alevy@codeaurora.org>2017-12-27 15:20:15 +0200
committerAmir Levy <alevy@codeaurora.org>2018-01-01 09:16:26 +0200
commitc7c1e0ade7b7c5aaa2ddb6d8981fed2c5398a9e3 (patch)
tree8780de1b2a827cfa1d7571951c8005cba2ee8d3d
parenta1c8e02b9bbeeda866c40b4895b28ef08e100f05 (diff)
downloadipacfg-mgr-c7c1e0ade7b7c5aaa2ddb6d8981fed2c5398a9e3.tar.gz
IPACM: fix GetIPAVer called too early
GetIPAVer() was called before IPA driver file was opened. Move call to a later stage at init. Change-Id: I48b68269a0711dbece4dc20da680e6863ed1aa67
-rw-r--r--ipacm/src/IPACM_Config.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipacm/src/IPACM_Config.cpp b/ipacm/src/IPACM_Config.cpp
index 78af72b..babc847 100644
--- a/ipacm/src/IPACM_Config.cpp
+++ b/ipacm/src/IPACM_Config.cpp
@@ -157,7 +157,6 @@ IPACM_Config::IPACM_Config()
memset(flt_rule_count_v4, 0, IPA_CLIENT_MAX*sizeof(int));
memset(flt_rule_count_v6, 0, IPA_CLIENT_MAX*sizeof(int));
memset(bridge_mac, 0, IPA_MAC_ADDR_SIZE*sizeof(uint8_t));
- ver = GetIPAVer(true);
IPACMDBG_H(" create IPACM_Config constructor\n");
return;
@@ -184,6 +183,7 @@ int IPACM_Config::Init(void)
{
IPACMERR("Failed opening %s.\n", DEVICE_NAME);
}
+ ver = GetIPAVer(true);
#ifdef FEATURE_IPACM_HAL
strlcpy(IPACM_config_file, "/vendor/etc/IPACM_cfg.xml", sizeof(IPACM_config_file));
#else