1 files changed, 10 insertions, 11 deletions

diff --git a/lib/if.c b/lib/if.c
index b26934c3f6..8945159aad 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -56,9 +56,6 @@ DEFINE_QOBJ_TYPE(interface)
 DEFINE_HOOK(if_add, (struct interface * ifp), (ifp))
 DEFINE_KOOH(if_del, (struct interface * ifp), (ifp))
 
-/* List of interfaces in only the default VRF */
-int ptm_enable = 0;
-
 /* Compare interface names, returning an integer greater than, equal to, or
  * less than 0, (following the strcmp convention), according to the
  * relationship between ifp1 and ifp2.  Interface names consist of an
@@ -234,8 +231,7 @@ void if_delete(struct interface *ifp)
 
 	if_link_params_free(ifp);
 
-	if (ifp->desc)
-		XFREE(MTYPE_TMP, ifp->desc);
+	XFREE(MTYPE_TMP, ifp->desc);
 
 	XFREE(MTYPE_IF, ifp);
 }
@@ -397,6 +393,7 @@ struct interface *if_get_by_name(const char *name, vrf_id_t vrf_id)
 	struct interface *ifp;
 
 	switch (vrf_get_backend()) {
+	case VRF_BACKEND_UNKNOWN:
 	case VRF_BACKEND_NETNS:
 		ifp = if_lookup_by_name(name, vrf_id);
 		if (ifp)
@@ -708,8 +705,7 @@ void connected_free(struct connected *connected)
 	if (connected->destination)
 		prefix_free(connected->destination);
 
-	if (connected->label)
-		XFREE(MTYPE_CONNECTED_LABEL, connected->label);
+	XFREE(MTYPE_CONNECTED_LABEL, connected->label);
 
 	XFREE(MTYPE_CONNECTED, connected);
 }
@@ -1281,6 +1277,11 @@ static int lib_interface_create(enum nb_event event,
 				  vrf->name);
 			return NB_ERR_VALIDATION;
 		}
+
+		/* if VRF is netns or not yet known - init for instance
+		 * then assumption is that passed config is exact
+		 * then the user intent was not to use an other iface
+		 */
 		if (vrf_get_backend() == VRF_BACKEND_VRF_LITE) {
 			ifp = if_lookup_by_name_all_vrf(ifname);
 			if (ifp && ifp->vrf_id != vrf->vrf_id) {
@@ -1349,8 +1350,7 @@ static int lib_interface_description_modify(enum nb_event event,
 		return NB_OK;
 
 	ifp = yang_dnode_get_entry(dnode, true);
-	if (ifp->desc)
-		XFREE(MTYPE_TMP, ifp->desc);
+	XFREE(MTYPE_TMP, ifp->desc);
 	description = yang_dnode_get_string(dnode, NULL);
 	ifp->desc = XSTRDUP(MTYPE_TMP, description);
 
@@ -1366,8 +1366,7 @@ static int lib_interface_description_destroy(enum nb_event event,
 		return NB_OK;
 
 	ifp = yang_dnode_get_entry(dnode, true);
-	if (ifp->desc)
-		XFREE(MTYPE_TMP, ifp->desc);
+	XFREE(MTYPE_TMP, ifp->desc);
 
 	return NB_OK;
 }