diff options
| author | Feng Lu <lu.feng@6wind.com> | 2015-05-22 11:39:58 +0200 |
|---|---|---|
| committer | Vipin Kumar <vipin@cumulusnetworks.com> | 2015-10-29 17:00:32 -0700 |
| commit | 6a69b354a6656f138a5f11e4542dc84f748f2bea (patch) | |
| tree | 8d48ae3adce87147c207aa54132ce9bab6d793c8 /ripd/rip_interface.c | |
| parent | 3968dbf8ef4966fb3f9d38640ea9c5a9f13419cf (diff) | |
*: call if_init()/if_terminate() from vrf_init()/vrf_terminate()
Later, an interface will belong to a specific VRF, and the interface
initialization will be a part of the VRF initialization. So now call
if_init() from vrf_init(), and if_terminate() from vrf_terminate().
Daemons have the according changes:
- if if_init() was called or "iflist" was initialized, now call
vrf_init() instead;
- if if_terminate() was called or "iflist" was destroyed, now call
vrf_terminate() instead.
Signed-off-by: Feng Lu <lu.feng@6wind.com>
Reviewed-by: Alain Ritoux <alain.ritoux@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Vincent JARDIN <vincent.jardin@6wind.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Conflicts:
bgpd/bgp_main.c
pimd/pim_iface.c
pimd/pim_iface.h
pimd/pim_main.c
pimd/pimd.c
Diffstat (limited to 'ripd/rip_interface.c')
| -rw-r--r-- | ripd/rip_interface.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 9a5bffe92b..b12ce5ee10 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -2077,7 +2077,6 @@ void rip_if_init (void) { /* Default initial size of interface vector. */ - if_init(); if_add_hook (IF_NEW_HOOK, rip_interface_new_hook); if_add_hook (IF_DELETE_HOOK, rip_interface_delete_hook); |
