Merge pull request #254 from donaldsharp/shutdown3

[mirror_frr.git] / lib / if.c

diff --git a/lib/if.c b/lib/if.c
index a1bac2ce81adabbc910025bf06c9c470e397b030..6ee84e126c5f40ff78acebbc40118bf2760ecfab 100644 (file)
--- a/lib/if.c
+++ b/lib/if.c
@@ -374,7 +374,7 @@ if_lookup_exact_address_vrf (void *src, int family, vrf_id_t vrf_id)
                }
              else if (family == AF_INET6)
                {
-                 if (IPV6_ADDR_SAME (&p->u.prefix4, (struct in6_addr *)src))
+                 if (IPV6_ADDR_SAME (&p->u.prefix6, (struct in6_addr *)src))
                    return ifp;
                }
            }
@@ -784,7 +784,7 @@ DEFUN (interface,
       vty_out (vty, "%% interface %s not in %s%s", ifname, vrfname, VTY_NEWLINE);
       return CMD_WARNING;
     }
-  VTY_PUSH_CONTEXT_COMPAT (INTERFACE_NODE, ifp);
+  VTY_PUSH_CONTEXT (INTERFACE_NODE, ifp);
 
   return CMD_SUCCESS;
 }
@@ -1019,11 +1019,9 @@ connected_same_prefix (struct prefix *p1, struct prefix *p2)
       if (p1->family == AF_INET &&
          IPV4_ADDR_SAME (&p1->u.prefix4, &p2->u.prefix4))
        return 1;
-#ifdef HAVE_IPV6
       if (p1->family == AF_INET6 &&
          IPV6_ADDR_SAME (&p1->u.prefix6, &p2->u.prefix6))
        return 1;
-#endif /* HAVE_IPV6 */
     }
   return 0;
 }
@@ -1302,7 +1300,7 @@ if_link_params_get (struct interface *ifp)
                                       sizeof (struct if_link_params));
   if (iflp == NULL) return NULL;
 
-  /* Set TE metric == standard metric */
+  /* Set TE metric equal to standard metric */
   iflp->te_metric = ifp->metric;
 
   /* Compute default bandwidth based on interface */
@@ -1316,7 +1314,7 @@ if_link_params_get (struct interface *ifp)
     iflp->unrsv_bw[i] = iflp->default_bw;
 
   /* Update Link parameters status */
-  iflp->lp_status = LP_TE | LP_MAX_BW | LP_MAX_RSV_BW | LP_UNRSV_BW;
+  iflp->lp_status = LP_TE_METRIC | LP_MAX_BW | LP_MAX_RSV_BW | LP_UNRSV_BW;
 
   /* Finally attach newly created Link Parameters */
   ifp->link_params = iflp;