diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2019-03-02 15:00:46 -0300 | 
|---|---|---|
| committer | Renato Westphal <renatowestphal@gmail.com> | 2019-03-29 11:32:21 -0300 | 
| commit | 8f88441d717c0ded412543cceabf0ddd93ee9f09 (patch) | |
| tree | 0a460d2da46a5b910535529c92e8db2fa5ff2a74 /ripngd/ripng_interface.c | |
| parent | 6a534dcafcb623f1b85b5ee2a13c74faab227ced (diff) | |
| parent | 700e9faa28bbdc3460e1d7aa109b6e4acaf347b3 (diff) | |
Merge remote-tracking branch 'frr/master' into rip-vrf
Merge commit to solve a bunch of conflicts with other PRs that were
merged in the previous weeks.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'ripngd/ripng_interface.c')
| -rw-r--r-- | ripngd/ripng_interface.c | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index edc258c05b..43fa663207 100644 --- a/ripngd/ripng_interface.c +++ b/ripngd/ripng_interface.c @@ -994,7 +994,7 @@ static struct cmd_node interface_node = {  };  /* Initialization of interface. */ -void ripng_if_init() +void ripng_if_init(void)  {  	/* Interface initialize. */  	hook_register_prio(if_add, 0, ripng_if_new_hook);  | 
