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

2
sys/kern/sys_socket.c

@ -142,7 +142,7 @@ soo_ioctl(fp, cmd, data, p)
if (IOCGROUP(cmd) == 'i')
return (ifioctl(so, cmd, data, p));
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));
}

7
sys/net/route.c

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

2
sys/net/route.h

@ -286,7 +286,7 @@ struct rtentry *
rtalloc1 __P((struct sockaddr *, int, u_long));
void rtfree __P((struct rtentry *));
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 *,
struct sockaddr *, int, struct sockaddr *, struct rtentry **));
int rtrequest __P((int, struct sockaddr *,