proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 14:05:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ripd: fix indentation problems introduced by wrong conflict resolution

Browse Source 
Restore trailing whitespaces from rip_interface_new() as well. If we
want to fix this, we need a separate commit just for this purpose.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
[DL: removed "restoring wrong whitespace" bits]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2016-12-05 17:31:42 -02:00 committed by David Lamparter
parent d7d73ffc8f
commit 4305dfd18c
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ripd/rip_interface.c
View File

@ -498,7 +498,7 @@ rip_interface_delete (int command, struct zclient *zclient,
static void static void
rip_interface_clean (struct rip_interface *ri) rip_interface_clean (struct rip_interface *ri)
{ {
ri->enable_network = 0; ri->enable_network = 0;
ri->enable_interface = 0; ri->enable_interface = 0;
ri->running = 0; ri->running = 0;
@ -508,7 +508,7 @@ rip_interface_clean (struct rip_interface *ri)
thread_cancel (ri->t_wakeup); thread_cancel (ri->t_wakeup);
ri->t_wakeup = NULL; ri->t_wakeup = NULL;
} }
} }
void void
rip_interfaces_clean (void) rip_interfaces_clean (void)
@ -522,7 +522,7 @@ rip_interfaces_clean (void)
static void static void
rip_interface_reset (struct rip_interface *ri) rip_interface_reset (struct rip_interface *ri)
{ {
/* Default authentication type is simple password for Cisco /* Default authentication type is simple password for Cisco
compatibility. */ compatibility. */
ri->auth_type = RIP_NO_AUTH; ri->auth_type = RIP_NO_AUTH;
@ -564,7 +564,7 @@ rip_interface_reset (struct rip_interface *ri)
ri->passive = 0; ri->passive = 0;
rip_interface_clean (ri); rip_interface_clean (ri);
} }
void void
rip_interfaces_reset (void) rip_interfaces_reset (void)