diff options
Diffstat (limited to 'ripngd/ripng_interface.c')
| -rw-r--r-- | ripngd/ripng_interface.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index d76e3a13..983db5b7 100644 --- a/ripngd/ripng_interface.c +++ b/ripngd/ripng_interface.c @@ -450,10 +450,19 @@ ripng_interface_address_add (int command, struct zclient *zclient, if (!ri->running) { /* Check if this interface is RIP enabled or not.*/ ripng_enable_apply (c->ifp); +<<<<<<< HEAD:ripngd/ripng_interface.c +======= /* Apply distribute list to the interface. */ ripng_distribute_update_interface (c->ifp); +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:ripngd/ripng_interface.c +<<<<<<< HEAD:ripngd/ripng_interface.c + /* Apply distribute list to the interface. */ + ripng_distribute_update_interface (c->ifp); + +======= +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:ripngd/ripng_interface.c /* Check interface routemap. */ ripng_if_rmap_update_interface (c->ifp); } |