commit 77158c4ba867bf88813324c1bcaf855d28f6476f
author Linux Build Service Account <lnxbuild@localhost> Fri Sep 18 07:41:22 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 18 07:41:22 2015 -0700
tree 10e128fb31deda9f5c1090c717bcfd242ec5b73b
parent 5a8c0fd531bbabdc4dce99b4d850f9d9f735ff36
parent b94558c4c468fabf5319b917c1f6d67a9cea27e1

Merge "IPACM: Handle NEIGH_EVENT for linklocal IP/IPv6 address"

ipacm/src/IPACM_Lan.cpp

diff --git a/ipacm/src/IPACM_Lan.cpp b/ipacm/src/IPACM_Lan.cpp
index 2cbab3e..a8aff0b 100644
--- a/ipacm/src/IPACM_Lan.cpp
+++ b/ipacm/src/IPACM_Lan.cpp
@@ -1889,7 +1889,6 @@
 	}
 fail:
 	free(pHeaderDescriptor);
-
 	return res;
 }
 
@@ -2352,7 +2351,6 @@
 	}
 fail:
 	free(pHeaderDescriptor);
-
 	return res;
 }
 
@@ -5455,10 +5453,8 @@
 	}
 
 fail:
-	if(pFilteringTable == NULL)
-	{
-		free(pFilteringTable);
-	}
+	free(pFilteringTable);
+
 	return res;
 }
 
@@ -5726,10 +5722,8 @@
 	}
 
 fail:
-	if (pFilteringTable == NULL)
-	{
-		free(pFilteringTable);
-	}
+	free(pFilteringTable);
+
 	return res;
 }
 

ipacm/src/IPACM_Wlan.cpp

diff --git a/ipacm/src/IPACM_Wlan.cpp b/ipacm/src/IPACM_Wlan.cpp
index f51c0c3..075da13 100644
--- a/ipacm/src/IPACM_Wlan.cpp
+++ b/ipacm/src/IPACM_Wlan.cpp
@@ -3767,10 +3767,7 @@
 	}
 
 fail:
-	if(pFilteringTable == NULL)
-	{
-		free(pFilteringTable);
-	}
+	free(pFilteringTable);
 	return res;
 }
 
@@ -4041,10 +4038,7 @@
 	}
 
 fail:
-	if(pFilteringTable == NULL)
-	{
-		free(pFilteringTable);
-	}
+	free(pFilteringTable);
 	return res;
 }
 
@@ -5369,9 +5363,6 @@
 		goto fail;
 	}
 fail:
-	if(pFilteringTable == NULL)
-	{
-		free(pFilteringTable);
-	}
+	free(pFilteringTable);
 	return res;
 }