Browse Source

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>
David Lamparter 7 years ago
parent
commit
51bdebad99
5 changed files with 0 additions and 39 deletions
  1. 0 4
      zebra/kernel_null.c
  2. 0 2
      zebra/rt.h
  3. 0 8
      zebra/rt_ioctl.c
  4. 0 9
      zebra/rt_netlink.c
  5. 0 16
      zebra/rt_socket.c

+ 0 - 4
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; }
 

+ 0 - 2
zebra/rt.h

@@ -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 */
 

+ 0 - 8
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 */

+ 0 - 9
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. */

+ 0 - 16
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 */