d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't bother passing p to rtioctl just so it can fail to pass it to mrt_ioctl

Browse Source
This commit is contained in:
Bill Fenner 2001-07-25 20:15:28 +00:00
parent fffcbbcd94
commit c3cb7e5d7a
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/kern/sys_socket.c
View File

@ -142,7 +142,7 @@ soo_ioctl(fp, cmd, data, p)
if (IOCGROUP(cmd) == 'i') if (IOCGROUP(cmd) == 'i')
return (ifioctl(so, cmd, data, p)); return (ifioctl(so, cmd, data, p));
if (IOCGROUP(cmd) == 'r') if (IOCGROUP(cmd) == 'r')
return (rtioctl(cmd, data, p)); return (rtioctl(cmd, data));
return ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd, data, 0, p)); return ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd, data, 0, p));
} }

7
sys/net/route.c
View File

@ -377,18 +377,13 @@ out:
* Routing table ioctl interface. * Routing table ioctl interface.
*/ */
int int
rtioctl(req, data, p) rtioctl(req, data)
int req; int req;
caddr_t data; caddr_t data;
struct proc *p;
{ {
#ifdef INET #ifdef INET
/* Multicast goop, grrr... */ /* Multicast goop, grrr... */
#ifdef MROUTING
return mrt_ioctl(req, data); return mrt_ioctl(req, data);
#else
return mrt_ioctl(req, data, p);
#endif
#else /* INET */ #else /* INET */
return ENXIO; return ENXIO;
#endif /* INET */ #endif /* INET */

2
sys/net/route.h
View File

@ -286,7 +286,7 @@ struct rtentry *
rtalloc1 __P((struct sockaddr *, int, u_long)); rtalloc1 __P((struct sockaddr *, int, u_long));
void rtfree __P((struct rtentry *)); void rtfree __P((struct rtentry *));
int rtinit __P((struct ifaddr *, int, int)); int rtinit __P((struct ifaddr *, int, int));
int rtioctl __P((int, caddr_t, struct proc *)); int rtioctl __P((int, caddr_t));
void rtredirect __P((struct sockaddr *, struct sockaddr *, void rtredirect __P((struct sockaddr *, struct sockaddr *,
struct sockaddr *, int, struct sockaddr *, struct rtentry **)); struct sockaddr *, int, struct sockaddr *, struct rtentry **));
int rtrequest __P((int, struct sockaddr *, int rtrequest __P((int, struct sockaddr *,