diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-07 00:56:16 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2018-05-07 00:56:16 -0600 |
| commit | 1018d6c355e5db2f8c99b04626267705693eadf6 (patch) | |
| tree | 19a94bef9497071faadcbca28dee9f3589cf989b | |
| parent | 041a55d64e16a2db63427f95e0e8836c200b1186 (diff) | |
| parent | b572adf65522c587964bacbc1c4623212d8040fd (diff) | |
Merge b572adf65522c587964bacbc1c4623212d8040fd on remote branch
Change-Id: Ib005e4161db1c7ab7023d6dd895fd504eb6c1c23
| -rw-r--r-- | ipacm/src/IPACM_Lan.cpp | 7 | ||||
| -rw-r--r-- | ipanat/src/Android.mk | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ipacm/src/IPACM_Lan.cpp b/ipacm/src/IPACM_Lan.cpp index 871b957..71b397b 100644 --- a/ipacm/src/IPACM_Lan.cpp +++ b/ipacm/src/IPACM_Lan.cpp @@ -3331,7 +3331,8 @@ int IPACM_Lan::handle_uplink_filter_rule(ipacm_ext_prop *prop, ipa_ip_type iptyp #ifdef FEATURE_IPACM_HAL /* add prefix equation in modem UL rules */ - if(iptype == IPA_IP_v4 && flt_rule_entry.rule.eq_attrib.num_offset_meq_32 < IPA_IPFLTR_NUM_MEQ_32_EQNS) + if(iptype == IPA_IP_v4 && (flt_rule_entry.rule.eq_attrib.num_offset_meq_32 >= 0) + && (flt_rule_entry.rule.eq_attrib.num_offset_meq_32 < IPA_IPFLTR_NUM_MEQ_32_EQNS)) { flt_rule_entry.rule.eq_attrib.num_offset_meq_32++; eq_index = flt_rule_entry.rule.eq_attrib.num_offset_meq_32 - 1; @@ -3365,7 +3366,9 @@ int IPACM_Lan::handle_uplink_filter_rule(ipacm_ext_prop *prop, ipa_ip_type iptyp } else { - if (flt_rule_entry.rule.eq_attrib.num_offset_meq_128 < IPA_IPFLTR_NUM_MEQ_128_EQNS) + if ((flt_rule_entry.rule.eq_attrib.num_offset_meq_128 >= 0) && + (flt_rule_entry.rule.eq_attrib.num_offset_meq_128 + < IPA_IPFLTR_NUM_MEQ_128_EQNS)) { flt_rule_entry.rule.eq_attrib.num_offset_meq_128++; eq_index = flt_rule_entry.rule.eq_attrib.num_offset_meq_128 - 1; diff --git a/ipanat/src/Android.mk b/ipanat/src/Android.mk index 681a03d..af12674 100644 --- a/ipanat/src/Android.mk +++ b/ipanat/src/Android.mk @@ -19,6 +19,7 @@ LOCAL_SRC_FILES := ipa_nat_drv.c \ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../inc LOCAL_VENDOR_MODULE := true LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_CFLAGS := -DDEBUG -Wall -Werror LOCAL_CFLAGS += -DFEATURE_IPA_ANDROID LOCAL_MODULE := libipanat |