commit a3347b213c13d50b4c486334352a641b80e05f54
author Linux Build Service Account <lnxbuild@localhost> Sat May 03 19:53:19 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat May 03 19:53:19 2014 -0700
tree c8b3a899c4defd911383e61a6882ccec8160b1f5
parent f41c21e9f72154b1cceff8a373f6e936335b17c3
parent 58befd2db2806129cf3ebd5cc9685c621fe090f8

Merge "IPACM: clean up q6 static UL filter rules"

ipacm/src/IPACM_Lan.cpp

diff --git a/ipacm/src/IPACM_Lan.cpp b/ipacm/src/IPACM_Lan.cpp
index 79269d5..c71042a 100644
--- a/ipacm/src/IPACM_Lan.cpp
+++ b/ipacm/src/IPACM_Lan.cpp
@@ -395,6 +395,9 @@
 			return IPACM_FAILURE;
 		}
 
+		memset(wan_ul_fl_rule_hdl_v4, 0, MAX_WAN_UL_FILTER_RULES * sizeof(uint32_t));
+		num_wan_ul_fl_rule_v4 = 0;
+
 		memset(&flt_index, 0, sizeof(flt_index));
 		flt_index.source_pipe_index = ioctl(fd, IPA_IOC_QUERY_EP_MAPPING, rx_prop->rx[0].src_pipe);
 		flt_index.install_status = IPA_QMI_RESULT_SUCCESS_V01;
@@ -412,9 +415,6 @@
 			close(fd);
 			return IPACM_FAILURE;
 		}
-
-		memset(wan_ul_fl_rule_hdl_v4, 0, MAX_WAN_UL_FILTER_RULES * sizeof(uint32_t));
-		num_wan_ul_fl_rule_v4 = 0;
 	}
 	else
 	{
@@ -1880,6 +1880,9 @@
 			return IPACM_FAILURE;
 		}
 
+		memset(wan_ul_fl_rule_hdl_v6, 0, MAX_WAN_UL_FILTER_RULES * sizeof(uint32_t));
+		num_wan_ul_fl_rule_v6 = 0;
+
 		memset(&flt_index, 0, sizeof(flt_index));
 		flt_index.source_pipe_index = ioctl(fd, IPA_IOC_QUERY_EP_MAPPING, rx_prop->rx[0].src_pipe);
 		flt_index.install_status = IPA_QMI_RESULT_SUCCESS_V01;
@@ -1897,9 +1900,6 @@
 			close(fd);
 			return IPACM_FAILURE;
 		}
-
-		memset(wan_ul_fl_rule_hdl_v6, 0, MAX_WAN_UL_FILTER_RULES * sizeof(uint32_t));
-		num_wan_ul_fl_rule_v6 = 0;
 	}
 	else
 	{