Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys It's been > 20years since rtioctl() did something. Let'...



details:   https://anonhg.NetBSD.org/src/rev/2b51e09889c4
branches:  trunk
changeset: 328968:2b51e09889c4
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sat Apr 26 11:10:10 2014 +0000

description:
It's been > 20years since rtioctl() did something.  Let's just
remove that special way of returning EOPNOTSUPP.

diffstat:

 sys/kern/sys_socket.c |   6 ++----
 sys/net/route.c       |  13 ++-----------
 sys/net/route.h       |   3 +--
 3 files changed, 5 insertions(+), 17 deletions(-)

diffs (78 lines):

diff -r d4bc6162245d -r 2b51e09889c4 sys/kern/sys_socket.c
--- a/sys/kern/sys_socket.c     Sat Apr 26 07:53:41 2014 +0000
+++ b/sys/kern/sys_socket.c     Sat Apr 26 11:10:10 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_socket.c,v 1.65 2011/12/20 23:56:28 christos Exp $ */
+/*     $NetBSD: sys_socket.c,v 1.66 2014/04/26 11:10:10 pooka Exp $    */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.65 2011/12/20 23:56:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.66 2014/04/26 11:10:10 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -198,8 +198,6 @@
                KERNEL_LOCK(1, NULL);
                if (IOCGROUP(cmd) == 'i')
                        error = ifioctl(so, cmd, data, curlwp);
-               else if (IOCGROUP(cmd) == 'r')
-                       error = rtioctl(cmd, data, curlwp);
                else {
                        error = (*so->so_proto->pr_usrreq)(so, PRU_CONTROL,
                            (struct mbuf *)cmd, (struct mbuf *)data, NULL,
diff -r d4bc6162245d -r 2b51e09889c4 sys/net/route.c
--- a/sys/net/route.c   Sat Apr 26 07:53:41 2014 +0000
+++ b/sys/net/route.c   Sat Apr 26 11:10:10 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: route.c,v 1.129 2014/03/22 07:46:35 maxv Exp $ */
+/*     $NetBSD: route.c,v 1.130 2014/04/26 11:10:10 pooka Exp $        */
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
 #include "opt_route.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.129 2014/03/22 07:46:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.130 2014/04/26 11:10:10 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -568,15 +568,6 @@
        rt_walktree(family, rtflushclone1, (void *)parent);
 }
 
-/*
- * Routing table ioctl interface.
- */
-int
-rtioctl(u_long req, void *data, struct lwp *l)
-{
-       return EOPNOTSUPP;
-}
-
 struct ifaddr *
 ifa_ifwithroute(int flags, const struct sockaddr *dst,
        const struct sockaddr *gateway)
diff -r d4bc6162245d -r 2b51e09889c4 sys/net/route.h
--- a/sys/net/route.h   Sat Apr 26 07:53:41 2014 +0000
+++ b/sys/net/route.h   Sat Apr 26 11:10:10 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: route.h,v 1.82 2013/03/01 18:25:57 joerg Exp $ */
+/*     $NetBSD: route.h,v 1.83 2014/04/26 11:10:10 pooka Exp $ */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -389,7 +389,6 @@
 void    rtfree(struct rtentry *);
 int     rt_getifa(struct rt_addrinfo *);
 int     rtinit(struct ifaddr *, int, int);
-int     rtioctl(u_long, void *, struct lwp *);
 void    rtredirect(const struct sockaddr *, const struct sockaddr *,
            const struct sockaddr *, int, const struct sockaddr *,
            struct rtentry **);



Home | Main Index | Thread Index | Old Index