summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bgpd/bgp_zebra.c2
-rw-r--r--lib/if.c4
-rw-r--r--lib/if.h4
-rw-r--r--zebra/if_netlink.c2
-rw-r--r--zebra/interface.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 64c20f3184..72bd081a7e 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -570,7 +570,7 @@ bgp_interface_vrf_update (int command, struct zclient *zclient, zebra_size_t len
}
}
- if_update_vrf (ifp, ifp->name, strlen (ifp->name), new_vrf_id);
+ if_update (ifp, ifp->name, strlen (ifp->name), new_vrf_id);
bgp = bgp_lookup_by_vrf_id (new_vrf_id);
if (!bgp)
diff --git a/lib/if.c b/lib/if.c
index 6dbadb868c..ecb7463168 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -160,7 +160,7 @@ if_create (const char *name, int namelen, vrf_id_t vrf_id)
/* Create new interface structure. */
void
-if_update_vrf (struct interface *ifp, const char *name, int namelen, vrf_id_t vrf_id)
+if_update (struct interface *ifp, const char *name, int namelen, vrf_id_t vrf_id)
{
struct list *intf_list = vrf_iflist_get (vrf_id);
@@ -455,7 +455,7 @@ if_get_by_name_len (const char *name, size_t namelen, vrf_id_t vrf_id, int vty)
}
else
{
- if_update_vrf (ifp, name, namelen, vrf_id);
+ if_update (ifp, name, namelen, vrf_id);
return ifp;
}
}
diff --git a/lib/if.h b/lib/if.h
index 7d88a9edf9..49f2a52478 100644
--- a/lib/if.h
+++ b/lib/if.h
@@ -390,8 +390,8 @@ struct nbr_connected
/* Prototypes. */
extern int if_cmp_name_func (char *, char *);
-extern void if_update_vrf (struct interface *, const char *name, int namelen,
- vrf_id_t vrf_id);
+extern void if_update (struct interface *, const char *name, int namelen,
+ vrf_id_t vrf_id);
extern struct interface *if_create (const char *name, int namelen,
vrf_id_t vrf_id);
extern struct interface *if_lookup_by_index (ifindex_t, vrf_id_t vrf_id);
diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 2572320cce..0a1cafd87e 100644
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -728,7 +728,7 @@ netlink_link_change (struct sockaddr_nl *snl, struct nlmsghdr *h,
{
/* pre-configured interface, learnt now */
if (ifp->vrf_id != vrf_id)
- if_update_vrf (ifp, name, strlen(name), vrf_id);
+ if_update (ifp, name, strlen(name), vrf_id);
}
/* Update interface information. */
diff --git a/zebra/interface.c b/zebra/interface.c
index 902e53dc5e..9abb54cec8 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -715,7 +715,7 @@ if_handle_vrf_change (struct interface *ifp, vrf_id_t vrf_id)
zebra_interface_vrf_update_del (ifp, vrf_id);
/* update VRF */
- if_update_vrf (ifp, ifp->name, strlen (ifp->name), vrf_id);
+ if_update (ifp, ifp->name, strlen (ifp->name), vrf_id);
/* Send out notification on interface VRF change. */
/* This is to issue an ADD, if needed. */