diff options
| author | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:03:41 +0000 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:03:41 +0000 |
| commit | 4e262455a252c700f81df75fb8107d112062bba8 (patch) | |
| tree | fbd55c66eebe78ccb60424e560548d1613aa403a /ripd/rip_interface.c | |
| parent | bfd498f0dab9a1937c6036cd35ed020b64a69e8f (diff) | |
| parent | 58e7db106d5907cb129fcc316f02ce0bf34e3885 (diff) | |
Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing
Conflicts:
bgpd/bgp_evpn.c
Diffstat (limited to 'ripd/rip_interface.c')
| -rw-r--r-- | ripd/rip_interface.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index d20954037d..3a773f2451 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -907,19 +907,17 @@ static void rip_connect_set(struct interface *ifp, int set) * "network IF_OR_PREF" one */ if ((rip_enable_if_lookup(connected->ifp->name) >= 0) || (rip_enable_network_lookup2(connected) >= 0)) - rip_redistribute_add( - ZEBRA_ROUTE_CONNECT, - RIP_ROUTE_INTERFACE, &address, - &nh, 0, 0, 0); + rip_redistribute_add(ZEBRA_ROUTE_CONNECT, + RIP_ROUTE_INTERFACE, + &address, &nh, 0, 0, 0); } else { rip_redistribute_delete(ZEBRA_ROUTE_CONNECT, RIP_ROUTE_INTERFACE, &address, connected->ifp->ifindex); if (rip_redistribute_check(ZEBRA_ROUTE_CONNECT)) - rip_redistribute_add( - ZEBRA_ROUTE_CONNECT, - RIP_ROUTE_REDISTRIBUTE, &address, - &nh, 0, 0, 0); + rip_redistribute_add(ZEBRA_ROUTE_CONNECT, + RIP_ROUTE_REDISTRIBUTE, + &address, &nh, 0, 0, 0); } } } |