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)

diff --git a/zebra/kernel_null.c b/zebra/kernel_null.c
index 285bf59af71254fbf69d054ae89ee7b8872d6b78..5efc1e2a551ef3b5769577f420cd279a385c7933 100644 (file)
--- 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 8e31bb6c563f70c385ad7b6e5f09ea8d08d83227..331df45c47b47017f2c26956837c93035cc05bdf 100644 (file)
--- 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 2bc64f6f3cf28e440501862879119856b7b5d88a..383c5f71ac616d2e0ac62d38bdcb8fb1968b8492 100644 (file)
--- 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 50a269dbc6aefdd237cad33786d88cc10e333bb8..9274f208269d7d29d7d8c74d78d936d7f6ea60e7 100644 (file)
--- 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 cc327ffbb0cf80a9df589a3393ca5cf6dc2202d1..ca2ddc1fc65f7569794ca1b92396ca4c9b66134a 100644 (file)
--- 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 */