diff options
| author |   mpi <mpi@openbsd.org> | 2016-11-21 10:30:42 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2016-11-21 10:30:42 +0000 |
| commit | a90c1397044f6523b88822314b47318e1d03ed62 (patch) | |
| tree | 8dd7f399956974064ed7d69d6465d45afb0142c2 | |
| parent | fix references to bio(3) to point to BIO(3) instead (diff) | |
| download | wireguard-openbsd-a90c1397044f6523b88822314b47318e1d03ed62.tar.xz wireguard-openbsd-a90c1397044f6523b88822314b47318e1d03ed62.zip | |
Kill rtioctl() stub, returning EOPNOTSUPP since tree import.
ok jsg@
| -rw-r--r-- | sys/kern/sys_socket.c | 4 | ||||
| -rw-r--r-- | sys/net/route.c | 8 | ||||
| -rw-r--r-- | sys/net/route.h | 3 |
3 files changed, 4 insertions, 11 deletions
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 1ed6dff439c..e824d9e132e 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_socket.c,v 1.23 2016/11/21 09:09:06 mpi Exp $ */ +/* $OpenBSD: sys_socket.c,v 1.24 2016/11/21 10:30:42 mpi Exp $ */ /* $NetBSD: sys_socket.c,v 1.13 1995/08/12 23:59:09 mycroft Exp $ */ /* @@ -122,7 +122,7 @@ soo_ioctl(struct file *fp, u_long cmd, caddr_t data, struct proc *p) if (IOCGROUP(cmd) == 'i') return (ifioctl(so, cmd, data, p)); if (IOCGROUP(cmd) == 'r') - return (rtioctl(cmd, data, p)); + return (EOPNOTSUPP); s = splsoftnet(); error = ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL, (struct mbuf *)cmd, (struct mbuf *)data, (struct mbuf *)NULL, p)); diff --git a/sys/net/route.c b/sys/net/route.c index 2046c73327a..ed85379ce6f 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.338 2016/11/15 10:09:28 mpi Exp $ */ +/* $OpenBSD: route.c,v 1.339 2016/11/21 10:30:42 mpi Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -728,12 +728,6 @@ rtflushclone(unsigned int rtableid, struct rtentry *parent) rtable_walk(rtableid, rt_key(parent)->sa_family, rtflushclone1, parent); } -int -rtioctl(u_long req, caddr_t data, struct proc *p) -{ - return (EOPNOTSUPP); -} - struct ifaddr * ifa_ifwithroute(int flags, struct sockaddr *dst, struct sockaddr *gateway, u_int rtableid) diff --git a/sys/net/route.h b/sys/net/route.h index ab786030239..17453164abf 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -1,4 +1,4 @@ -/* $OpenBSD: route.h,v 1.148 2016/09/24 19:27:10 phessler Exp $ */ +/* $OpenBSD: route.h,v 1.149 2016/11/21 10:30:42 mpi Exp $ */ /* $NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $ */ /* @@ -403,7 +403,6 @@ int rt_ifa_del(struct ifaddr *, int, struct sockaddr *); void rt_ifa_purge(struct ifaddr *); int rt_ifa_addlocal(struct ifaddr *); int rt_ifa_dellocal(struct ifaddr *); -int rtioctl(u_long, caddr_t, struct proc *); void rtredirect(struct sockaddr *, struct sockaddr *, struct sockaddr *, struct rtentry **, unsigned int); int rtrequest(int, struct rt_addrinfo *, u_int8_t, struct rtentry **, u_int); |