diff options
author | Cyan_Hsieh <cyanhsieh@google.com> | 2018-10-04 12:22:49 +0800 |
---|---|---|
committer | Robin Peng <robinpeng@google.com> | 2018-10-04 15:54:19 +0800 |
commit | 5c6ae3735ae624c1fefabe049cf81d245085531e (patch) | |
tree | 2390b2d8678ecf8ce54c9d46073affcecce4d4a7 /ipacm/inc | |
parent | ac96cd8c8a107830a3898f1d175271d17e6cc21a (diff) | |
parent | ddb431ed90c247516c3fa19bcc09d4539437666b (diff) | |
download | ipacfg-mgr-5c6ae3735ae624c1fefabe049cf81d245085531e.tar.gz |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.1.R1.09.00.00.461.057' into pi-dev
Conflicts:
ipacm/src/Android.mk
Bug: 117197316
Change-Id: Ib75e02188e4bfc221ae7517b75182c4aa38c96d9
Diffstat (limited to 'ipacm/inc')
-rw-r--r-- | ipacm/inc/IPACM_Iface.h | 2 | ||||
-rw-r--r-- | ipacm/inc/IPACM_Wan.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ipacm/inc/IPACM_Iface.h b/ipacm/inc/IPACM_Iface.h index 8ff7450..a562613 100644 --- a/ipacm/inc/IPACM_Iface.h +++ b/ipacm/inc/IPACM_Iface.h @@ -59,7 +59,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define IPV4_DEFAULT_FILTERTING_RULES 3 #ifdef FEATURE_IPA_ANDROID -#define IPV6_DEFAULT_FILTERTING_RULES 7 +#define IPV6_DEFAULT_FILTERTING_RULES 8 #else #define IPV6_DEFAULT_FILTERTING_RULES 4 #endif diff --git a/ipacm/inc/IPACM_Wan.h b/ipacm/inc/IPACM_Wan.h index b1f38cb..29b1341 100644 --- a/ipacm/inc/IPACM_Wan.h +++ b/ipacm/inc/IPACM_Wan.h @@ -53,9 +53,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define IPA_V2_NUM_DEFAULT_WAN_FILTER_RULE_IPV4 2 #ifdef FEATURE_IPA_ANDROID -#define IPA_V2_NUM_DEFAULT_WAN_FILTER_RULE_IPV6 6 +#define IPA_V2_NUM_DEFAULT_WAN_FILTER_RULE_IPV6 7 #define IPA_V2_NUM_TCP_WAN_FILTER_RULE_IPV6 3 #define IPA_V2_NUM_MULTICAST_WAN_FILTER_RULE_IPV6 3 +#define IPA_V2_NUM_FRAG_WAN_FILTER_RULE_IPV6 1 #else #define IPA_V2_NUM_DEFAULT_WAN_FILTER_RULE_IPV6 3 #endif |