Module Name: src Committed By: pooka Date: Sat Apr 26 11:10:10 UTC 2014
Modified Files: src/sys/kern: sys_socket.c src/sys/net: route.c route.h Log Message: It's been > 20years since rtioctl() did something. Let's just remove that special way of returning EOPNOTSUPP. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/kern/sys_socket.c cvs rdiff -u -r1.129 -r1.130 src/sys/net/route.c cvs rdiff -u -r1.82 -r1.83 src/sys/net/route.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/sys_socket.c diff -u src/sys/kern/sys_socket.c:1.65 src/sys/kern/sys_socket.c:1.66 --- src/sys/kern/sys_socket.c:1.65 Tue Dec 20 23:56:28 2011 +++ src/sys/kern/sys_socket.c Sat Apr 26 11:10:10 2014 @@ -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 @@ soo_ioctl(file_t *fp, u_long cmd, void * 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, Index: src/sys/net/route.c diff -u src/sys/net/route.c:1.129 src/sys/net/route.c:1.130 --- src/sys/net/route.c:1.129 Sat Mar 22 07:46:35 2014 +++ src/sys/net/route.c Sat Apr 26 11:10:10 2014 @@ -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 @@ rtflushclone(sa_family_t family, struct 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) Index: src/sys/net/route.h diff -u src/sys/net/route.h:1.82 src/sys/net/route.h:1.83 --- src/sys/net/route.h:1.82 Fri Mar 1 18:25:57 2013 +++ src/sys/net/route.h Sat Apr 26 11:10:10 2014 @@ -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 @@ struct rtentry * 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 **);