commit 96232deaab12b4f055f74eb8b6698744ee9f0859
author Linux Build Service Account <lnxbuild@localhost> Thu Mar 13 19:41:31 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Mar 13 19:41:31 2014 -0700
tree 067e6b0a50c9d4291b72b6d4ec425bf17dd9f5bc
parent 6031154c549bee03572c377f2f604a77feb2b2ff
parent d6a64e00be2f3482f731cd105f8fa2616bd0acb5

Merge "IPACM: fix ipv6 backhaul up again crash issue"

ipacm/src/IPACM_Wan.cpp

diff --git a/ipacm/src/IPACM_Wan.cpp b/ipacm/src/IPACM_Wan.cpp
index 560a604..1f04701 100644
--- a/ipacm/src/IPACM_Wan.cpp
+++ b/ipacm/src/IPACM_Wan.cpp
@@ -380,9 +380,6 @@
 						del_dft_firewall_rules(IPA_IP_v4);
 						handle_route_del_evt(IPA_IP_v4);
 					}
-					
-					IPACM_Wan::wan_up = false;
-					IPACM_Wan::rx_prop = NULL;
 				}
 				else if ((data->iptype == IPA_IP_v6) && (!data->ipv6_addr[0]) && (!data->ipv6_addr[1]) && (!data->ipv6_addr[2]) && (!data->ipv6_addr[3]) && (active_v6 == true))
 				{
@@ -399,9 +396,6 @@
 						del_dft_firewall_rules(IPA_IP_v6);
 						handle_route_del_evt(IPA_IP_v6);
 					}
-					
-					IPACM_Wan::wan_up_v6 = false;
-					IPACM_Wan::rx_prop = NULL;
 				}
 			}
 		}
@@ -2752,7 +2746,6 @@
 
 		if (iptype == IPA_IP_v4)
 		{
-		
 			wandown_data->ipv4_addr = wan_v4_addr;
 			evt_data.event = IPA_HANDLE_WAN_DOWN;
 			evt_data.evt_data = (void *)wandown_data;
@@ -2761,12 +2754,10 @@
 			IPACM_EvtDispatcher::PostEvt(&evt_data);
 			IPACMDBG("setup wan_up/active_v4= false \n"); 
 			IPACM_Wan::wan_up = false;
-			IPACM_Wan::rx_prop = NULL;
 			active_v4 = false;
 		}
 		else
 		{
-		
 			evt_data.event = IPA_HANDLE_WAN_DOWN_V6;
 			evt_data.evt_data = (void *)wandown_data;
 			/* Insert IPA_HANDLE_WAN_DOWN to command queue */
@@ -2775,7 +2766,6 @@
 			
 			IPACMDBG("setup wan_up_v6/active_v6= false \n"); 
 			IPACM_Wan::wan_up_v6 = false;
-			IPACM_Wan::rx_prop = NULL;
 			active_v6 = false;
 		}
 	}
@@ -2830,7 +2820,6 @@
 		
 		if (iptype == IPA_IP_v4)
 		{
-		
 			wandown_data->ipv4_addr = wan_v4_addr;
 			evt_data.event = IPA_HANDLE_WAN_DOWN;
 			evt_data.evt_data = (void *)wandown_data;