diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2014-06-28 21:28:50 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2015-02-14 19:18:56 +0100 |
| commit | 51bdebad99fe813d1b7104543b352f0e39b1c8dc (patch) | |
| tree | b2040a5c538cd3168a6c8842b92e28e35fa17420 | |
| parent | 86a82e99aa3728d78a1ec65b60a2162914cd7519 (diff) | |
| download | quagga-51bdebad99fe813d1b7104543b352f0e39b1c8dc.tar.bz2 quagga-51bdebad99fe813d1b7104543b352f0e39b1c8dc.tar.xz | |
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>
| -rw-r--r-- | zebra/kernel_null.c | 4 | ||||
| -rw-r--r-- | zebra/rt.h | 2 | ||||
| -rw-r--r-- | zebra/rt_ioctl.c | 8 | ||||
| -rw-r--r-- | zebra/rt_netlink.c | 9 | ||||
| -rw-r--r-- | zebra/rt_socket.c | 16 |
5 files changed, 0 insertions, 39 deletions
diff --git a/zebra/kernel_null.c b/zebra/kernel_null.c index 29c7881b..4cd43db4 100644 --- a/zebra/kernel_null.c +++ b/zebra/kernel_null.c @@ -43,10 +43,6 @@ int kernel_add_ipv6 (struct prefix *a, struct rib *b) { return 0; } int kernel_delete_ipv6 (struct prefix *a, struct rib *b) { return 0; } #endif -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; } @@ -36,8 +36,6 @@ extern int kernel_address_delete_ipv4 (struct interface *, struct connected *); #ifdef HAVE_IPV6 extern int kernel_add_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 e175d1e2..553f222c 100644 --- a/zebra/rt_ioctl.c +++ b/zebra/rt_ioctl.c @@ -517,12 +517,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 12dbd1ad..2350070c 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -1855,15 +1855,6 @@ kernel_delete_ipv6 (struct prefix *p, struct rib *rib) { return netlink_route_multipath (RTM_DELROUTE, 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 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 cde71ef4..63470adc 100644 --- a/zebra/rt_socket.c +++ b/zebra/rt_socket.c @@ -474,20 +474,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 */ |