commit 820aea6b6800b5690217da0f4d449adc377908c5
author Linux Build Service Account <lnxbuild@localhost> Mon Jul 14 18:10:29 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jul 14 18:10:29 2014 -0700
tree 0fc9bbd659d6e1ea6ac63de19d72e201c1db6dcf
parent ec90eb22ab3a27e86d745ed565dad1fc99b62636
parent 57c11b705e383f3eff936706f8961e415b7b4de7

Merge "IPACM: reduce the prints in QXDM"

ipacm/src/IPACM_Lan.cpp

diff --git a/ipacm/src/IPACM_Lan.cpp b/ipacm/src/IPACM_Lan.cpp
index 8323bf0..a09bd2f 100644
--- a/ipacm/src/IPACM_Lan.cpp
+++ b/ipacm/src/IPACM_Lan.cpp
@@ -588,8 +588,8 @@
 #ifdef CT_OPT
 		install_tcp_ctl_flt_rule(IPA_IP_v4);
 #endif
-		add_dummy_lan2lan_flt_rule(data->iptype);
 		init_fl_rule(data->iptype);
+		add_dummy_lan2lan_flt_rule(data->iptype);
 	}
 	else
 	{

ipacm/src/IPACM_Wlan.cpp

diff --git a/ipacm/src/IPACM_Wlan.cpp b/ipacm/src/IPACM_Wlan.cpp
index b3f2d59..4489bdb 100644
--- a/ipacm/src/IPACM_Wlan.cpp
+++ b/ipacm/src/IPACM_Wlan.cpp
@@ -582,11 +582,10 @@
 			return IPACM_FAILURE;
 		}
 #ifndef CT_OPT
-		offset = wlan_ap_index * (IPV4_DEFAULT_FILTERTING_RULES + MAX_OFFLOAD_PAIR + IPACM_Iface::ipacmcfg->ipa_num_private_subnet)
-								+ MAX_OFFLOAD_PAIR;
+		offset = wlan_ap_index * (IPV4_DEFAULT_FILTERTING_RULES + MAX_OFFLOAD_PAIR + IPACM_Iface::ipacmcfg->ipa_num_private_subnet);
 #else
 		offset = wlan_ap_index * (IPV4_DEFAULT_FILTERTING_RULES + NUM_TCP_CTL_FLT_RULE + MAX_OFFLOAD_PAIR + IPACM_Iface::ipacmcfg->ipa_num_private_subnet)
-								+ NUM_TCP_CTL_FLT_RULE + MAX_OFFLOAD_PAIR;
+								+ NUM_TCP_CTL_FLT_RULE;
 #endif
 
 #ifdef FEATURE_IPA_ANDROID
@@ -780,10 +779,11 @@
 		}
 
 #ifndef CT_OPT
-		offset = wlan_ap_index * (IPV4_DEFAULT_FILTERTING_RULES + MAX_OFFLOAD_PAIR + IPACM_Iface::ipacmcfg->ipa_num_private_subnet);
+		offset = wlan_ap_index * (IPV4_DEFAULT_FILTERTING_RULES + MAX_OFFLOAD_PAIR + IPACM_Iface::ipacmcfg->ipa_num_private_subnet)
+						+ IPV4_DEFAULT_FILTERTING_RULES;
 #else
 		offset = wlan_ap_index * (IPV4_DEFAULT_FILTERTING_RULES + NUM_TCP_CTL_FLT_RULE + MAX_OFFLOAD_PAIR + IPACM_Iface::ipacmcfg->ipa_num_private_subnet)
-						+ NUM_TCP_CTL_FLT_RULE;
+						+ NUM_TCP_CTL_FLT_RULE + IPV4_DEFAULT_FILTERTING_RULES;
 #endif
 
 #ifdef FEATURE_IPA_ANDROID