commit 87735cb4a198e744df3dc22eebdecea5cd8b4f07
author Linux Build Service Account <lnxbuild@localhost> Sat Jul 19 10:17:40 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Jul 19 10:17:40 2014 -0700
tree cb8473eeb236a0dd4fe519f557ecd4b3bb2b0589
parent 04998a1d08a9563c7ea9690ae5385f51de1f8ca7
parent 7c7b9f2419aa82d6f031daf3a0ad2cb3ce81b015

Merge "IPACM: fix the index issue of incorrect modem UL filtering rule"

ipacm/src/IPACM_Lan.cpp

diff --git a/ipacm/src/IPACM_Lan.cpp b/ipacm/src/IPACM_Lan.cpp
index a09bd2f..0bfe4c7 100644
--- a/ipacm/src/IPACM_Lan.cpp
+++ b/ipacm/src/IPACM_Lan.cpp
@@ -369,7 +369,10 @@
 			return;
 		}
 		IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->is_sta);
-		handle_wan_down(data_wan->is_sta);
+		if(ip_type == IPA_IP_v4 || ip_type == IPA_IP_MAX)
+		{
+			handle_wan_down(data_wan->is_sta);
+		}
 		break;
 
 	case IPA_HANDLE_WAN_DOWN_V6:
@@ -386,7 +389,10 @@
 		handle_lan_client_reset_rt(IPA_IP_v6);
 
 		IPACMDBG_H("Backhaul is sta mode?%d\n", data_wan->is_sta);
-		handle_wan_down_v6(data_wan->is_sta);
+		if(ip_type == IPA_IP_v6 || ip_type == IPA_IP_MAX)
+		{
+			handle_wan_down_v6(data_wan->is_sta);
+		}
 		break;
 
 	case IPA_NEIGH_CLIENT_IP_ADDR_ADD_EVENT:
@@ -2042,9 +2048,9 @@
 	}
 
 #ifdef CT_OPT
-	flt_rule_count_v6 = IPV6_DEFAULT_FILTERTING_RULES + NUM_TCP_CTL_FLT_RULE + MAX_OFFLOAD_PAIR + NUM_IPV6_PREFIX_FLT_RULE;
+	flt_rule_count_v6 = IPV6_DEFAULT_FILTERTING_RULES + NUM_TCP_CTL_FLT_RULE + MAX_OFFLOAD_PAIR;
 #else
-	flt_rule_count_v6 = IPV6_DEFAULT_FILTERTING_RULES + MAX_OFFLOAD_PAIR + NUM_IPV6_PREFIX_FLT_RULE;
+	flt_rule_count_v6 = IPV6_DEFAULT_FILTERTING_RULES + MAX_OFFLOAD_PAIR;
 #endif
 
 	if(m_filtering.DeleteFilteringHdls(ipv6_prefix_flt_rule_hdl, IPA_IP_v6, NUM_IPV6_PREFIX_FLT_RULE) == false)

ipacm/src/IPACM_Wlan.cpp

diff --git a/ipacm/src/IPACM_Wlan.cpp b/ipacm/src/IPACM_Wlan.cpp
index 4489bdb..5cbcc4c 100644
--- a/ipacm/src/IPACM_Wlan.cpp
+++ b/ipacm/src/IPACM_Wlan.cpp
@@ -360,7 +360,10 @@
 		}
 		if (rx_prop != NULL)
 		{
-			handle_wan_down(data_wan->is_sta);
+			if(ip_type == IPA_IP_v4 || ip_type == IPA_IP_MAX)
+			{
+				handle_wan_down(data_wan->is_sta);
+			}
 		}
 		break;
 
@@ -385,7 +388,10 @@
 		}
 		if (rx_prop != NULL)
 		{
-			handle_wan_down_v6(data_wan->is_sta);
+			if(ip_type == IPA_IP_v6 || ip_type == IPA_IP_MAX)
+			{
+				handle_wan_down_v6(data_wan->is_sta);
+			}
 		}
 		break;