From 9e3a437b020ea574fcfe95002b095303f7f18c26 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Sat, 28 Jun 2014 21:28:50 +0200 Subject: [PATCH] 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 Acked-by: Greg Troxel Acked-by: Feng Lu Acked-by: Paul Jakma (cherry picked from commit 51bdebad99fe813d1b7104543b352f0e39b1c8dc) --- zebra/kernel_null.c | 4 ---- zebra/rt.h | 2 -- zebra/rt_ioctl.c | 8 -------- zebra/rt_netlink.c | 9 --------- zebra/rt_socket.c | 16 ---------------- 5 files changed, 39 deletions(-) diff --git a/zebra/kernel_null.c b/zebra/kernel_null.c index 285bf59af7..5efc1e2a55 100644 --- a/zebra/kernel_null.c +++ b/zebra/kernel_null.c @@ -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; } diff --git a/zebra/rt.h b/zebra/rt.h index 8e31bb6c56..331df45c47 100644 --- a/zebra/rt.h +++ b/zebra/rt.h @@ -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 */ diff --git a/zebra/rt_ioctl.c b/zebra/rt_ioctl.c index 2bc64f6f3c..383c5f71ac 100644 --- a/zebra/rt_ioctl.c +++ b/zebra/rt_ioctl.c @@ -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 */ diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 50a269dbc6..9274f20826 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -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. */ diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c index cc327ffbb0..ca2ddc1fc6 100644 --- a/zebra/rt_socket.c +++ b/zebra/rt_socket.c @@ -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 */ -- 2.39.5