mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-15 13:05:11 +00:00
zebra: remove kernel_delete_ipv6_old()
The only user of this was rib_bogus_ipv6(), which was removed in the previous commit. Good riddance. Signed-off-by: David Lamparter <equinox@opensourcerouting.org> Acked-by: Greg Troxel <gdt@ir.bbn.com> Acked-by: Feng Lu <lu.feng@6wind.com> Acked-by: Paul Jakma <paul@jakma.org> (cherry picked from commit 51bdebad99fe813d1b7104543b352f0e39b1c8dc)
This commit is contained in:
parent
bc3dd427f2
commit
9e3a437b02
@ -39,10 +39,6 @@ int kernel_add_ipv6 (struct prefix *a, struct rib *b) { return 0; }
|
||||
int kernel_update_ipv6 (struct prefix *a, struct rib *b) { return 0; }
|
||||
int kernel_delete_ipv6 (struct prefix *a, struct rib *b) { return 0; }
|
||||
|
||||
int kernel_delete_ipv6_old (struct prefix_ipv6 *dest, struct in6_addr *gate,
|
||||
unsigned int index, int flags, int table)
|
||||
{ return 0; }
|
||||
|
||||
int kernel_add_route (struct prefix_ipv4 *a, struct in_addr *b, int c, int d)
|
||||
{ return 0; }
|
||||
|
||||
|
@ -38,8 +38,6 @@ extern int kernel_address_delete_ipv4 (struct interface *, struct connected *);
|
||||
extern int kernel_add_ipv6 (struct prefix *, struct rib *);
|
||||
extern int kernel_update_ipv6 (struct prefix *, struct rib *);
|
||||
extern int kernel_delete_ipv6 (struct prefix *, struct rib *);
|
||||
extern int kernel_delete_ipv6_old (struct prefix_ipv6 *dest, struct in6_addr *gate,
|
||||
unsigned int index, int flags, int table);
|
||||
|
||||
#endif /* HAVE_IPV6 */
|
||||
|
||||
|
@ -527,12 +527,4 @@ kernel_delete_ipv6 (struct prefix *p, struct rib *rib)
|
||||
{
|
||||
return kernel_ioctl_ipv6_multipath (SIOCDELRT, p, rib, AF_INET6);
|
||||
}
|
||||
|
||||
/* Delete IPv6 route from the kernel. */
|
||||
int
|
||||
kernel_delete_ipv6_old (struct prefix_ipv6 *dest, struct in6_addr *gate,
|
||||
unsigned int index, int flags, int table)
|
||||
{
|
||||
return kernel_ioctl_ipv6 (SIOCDELRT, dest, gate, index, flags);
|
||||
}
|
||||
#endif /* HAVE_IPV6 */
|
||||
|
@ -2394,15 +2394,6 @@ kernel_delete_ipv6 (struct prefix *p, struct rib *rib)
|
||||
return netlink_route_multipath (RTM_DELROUTE, p, rib, AF_INET6, 0);
|
||||
}
|
||||
}
|
||||
|
||||
/* Delete IPv6 route from the kernel. */
|
||||
int
|
||||
kernel_delete_ipv6_old (struct prefix_ipv6 *dest, struct in6_addr *gate,
|
||||
unsigned int index, int flags, int table)
|
||||
{
|
||||
return netlink_route (RTM_DELROUTE, AF_INET6, &dest->prefix,
|
||||
dest->prefixlen, gate, index, flags, table);
|
||||
}
|
||||
#endif /* HAVE_IPV6 */
|
||||
|
||||
/* Interface address modification. */
|
||||
|
@ -489,20 +489,4 @@ kernel_delete_ipv6 (struct prefix *p, struct rib *rib)
|
||||
|
||||
return route;
|
||||
}
|
||||
|
||||
/* Delete IPv6 route from the kernel. */
|
||||
int
|
||||
kernel_delete_ipv6_old (struct prefix_ipv6 *dest, struct in6_addr *gate,
|
||||
unsigned int index, int flags, int table)
|
||||
{
|
||||
int route;
|
||||
|
||||
if (zserv_privs.change(ZPRIVS_RAISE))
|
||||
zlog (NULL, LOG_ERR, "Can't raise privileges");
|
||||
route = kernel_rtm_ipv6 (RTM_DELETE, dest, gate, index, flags);
|
||||
if (zserv_privs.change(ZPRIVS_LOWER))
|
||||
zlog (NULL, LOG_ERR, "Can't lower privileges");
|
||||
|
||||
return route;
|
||||
}
|
||||
#endif /* HAVE_IPV6 */
|
||||
|
Loading…
Reference in New Issue
Block a user