diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/tcp_usrreq.c | 4 | ||||
| -rw-r--r-- | sys/netinet/udp_usrreq.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/in6.c | 18 | ||||
| -rw-r--r-- | sys/netinet6/in6_var.h | 5 | ||||
| -rw-r--r-- | sys/netinet6/ip6_divert.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/raw_ip6.c | 4 |
6 files changed, 18 insertions, 21 deletions
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 51c06c73129..b45ed2dca35 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_usrreq.c,v 1.116 2013/10/20 11:03:01 phessler Exp $ */ +/* $OpenBSD: tcp_usrreq.c,v 1.117 2013/11/22 07:59:09 mpi Exp $ */ /* $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */ /* @@ -144,7 +144,7 @@ tcp_usrreq(so, req, m, nam, control, p) #ifdef INET6 if (sotopf(so) == PF_INET6) return in6_control(so, (u_long)m, (caddr_t)nam, - (struct ifnet *)control, 0); + (struct ifnet *)control); else #endif /* INET6 */ return (in_control(so, (u_long)m, (caddr_t)nam, diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 0aca9ff7d6f..cce2b10495b 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp_usrreq.c,v 1.170 2013/10/20 11:03:01 phessler Exp $ */ +/* $OpenBSD: udp_usrreq.c,v 1.171 2013/11/22 07:59:09 mpi Exp $ */ /* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */ /* @@ -1128,7 +1128,7 @@ udp_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *addr, #ifdef INET6 if (inp->inp_flags & INP_IPV6) return (in6_control(so, (u_long)m, (caddr_t)addr, - (struct ifnet *)control, 0)); + (struct ifnet *)control)); else #endif /* INET6 */ return (in_control(so, (u_long)m, (caddr_t)addr, diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index c9a3255fad6..715476a6811 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.c,v 1.124 2013/11/13 08:27:24 stsp Exp $ */ +/* $OpenBSD: in6.c,v 1.125 2013/11/22 07:59:09 mpi Exp $ */ /* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */ /* @@ -119,8 +119,7 @@ const struct in6_addr in6mask64 = IN6MASK64; const struct in6_addr in6mask96 = IN6MASK96; const struct in6_addr in6mask128 = IN6MASK128; -int in6_lifaddr_ioctl(struct socket *, u_long, caddr_t, struct ifnet *, - struct proc *); +int in6_lifaddr_ioctl(struct socket *, u_long, caddr_t, struct ifnet *); int in6_ifinit(struct ifnet *, struct in6_ifaddr *, int); void in6_unlink_ifa(struct in6_ifaddr *, struct ifnet *); void in6_ifloop_request(int, struct ifaddr *); @@ -332,8 +331,7 @@ in6_mask2len(struct in6_addr *mask, u_char *lim0) } int -in6_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, - struct proc *p) +in6_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp) { struct in6_ifreq *ifr = (struct in6_ifreq *)data; struct in6_ifaddr *ia = NULL; @@ -389,7 +387,7 @@ in6_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, return (EPERM); /* FALLTHROUGH */ case SIOCGLIFADDR: - return in6_lifaddr_ioctl(so, cmd, data, ifp, p); + return in6_lifaddr_ioctl(so, cmd, data, ifp); } /* @@ -1301,8 +1299,8 @@ in6_unlink_ifa(struct in6_ifaddr *ia, struct ifnet *ifp) * address encoding scheme. (see figure on page 8) */ int -in6_lifaddr_ioctl(struct socket *so, u_long cmd, caddr_t data, - struct ifnet *ifp, struct proc *p) +in6_lifaddr_ioctl(struct socket *so, u_long cmd, caddr_t data, + struct ifnet *ifp) { struct if_laddrreq *iflr = (struct if_laddrreq *)data; struct ifaddr *ifa; @@ -1409,7 +1407,7 @@ in6_lifaddr_ioctl(struct socket *so, u_long cmd, caddr_t data, in6_prefixlen2mask(&ifra.ifra_prefixmask.sin6_addr, prefixlen); ifra.ifra_flags = iflr->flags & ~IFLR_PREFIX; - return in6_control(so, SIOCAIFADDR_IN6, (caddr_t)&ifra, ifp, p); + return in6_control(so, SIOCAIFADDR_IN6, (caddr_t)&ifra, ifp); } case SIOCGLIFADDR: case SIOCDLIFADDR: @@ -1505,7 +1503,7 @@ in6_lifaddr_ioctl(struct socket *so, u_long cmd, caddr_t data, ifra.ifra_flags = ia->ia6_flags; return in6_control(so, SIOCDIFADDR_IN6, (caddr_t)&ifra, - ifp, p); + ifp); } } } diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index 28a15e92525..919ff997f9f 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_var.h,v 1.44 2013/10/24 11:31:43 mpi Exp $ */ +/* $OpenBSD: in6_var.h,v 1.45 2013/11/22 07:59:09 mpi Exp $ */ /* $KAME: in6_var.h,v 1.55 2001/02/16 12:49:45 itojun Exp $ */ /* @@ -528,8 +528,7 @@ struct in6_multi *in6_addmulti(struct in6_addr *, struct ifnet *, int *); void in6_delmulti(struct in6_multi *); struct in6_multi_mship *in6_joingroup(struct ifnet *, struct in6_addr *, int *); int in6_leavegroup(struct in6_multi_mship *); -int in6_control(struct socket *, u_long, caddr_t, struct ifnet *, - struct proc *); +int in6_control(struct socket *, u_long, caddr_t, struct ifnet *); int in6_update_ifa(struct ifnet *, struct in6_aliasreq *, struct in6_ifaddr *); void in6_purgeaddr(struct ifaddr *); diff --git a/sys/netinet6/ip6_divert.c b/sys/netinet6/ip6_divert.c index 7d84dfa484e..445e3dd7fb9 100644 --- a/sys/netinet6/ip6_divert.c +++ b/sys/netinet6/ip6_divert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_divert.c,v 1.15 2013/11/15 16:46:15 lteo Exp $ */ +/* $OpenBSD: ip6_divert.c,v 1.16 2013/11/22 07:59:09 mpi Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -277,7 +277,7 @@ divert6_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *addr, if (req == PRU_CONTROL) { return (in6_control(so, (u_long)m, (caddr_t)addr, - (struct ifnet *)control, p)); + (struct ifnet *)control)); } if (inp == NULL && req != PRU_ATTACH) { error = EINVAL; diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index c037815376d..a0fc81ca57a 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ip6.c,v 1.61 2013/10/23 19:57:50 deraadt Exp $ */ +/* $OpenBSD: raw_ip6.c,v 1.62 2013/11/22 07:59:09 mpi Exp $ */ /* $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $ */ /* @@ -597,7 +597,7 @@ rip6_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, if (req == PRU_CONTROL) return (in6_control(so, (u_long)m, (caddr_t)nam, - (struct ifnet *)control, p)); + (struct ifnet *)control)); switch (req) { case PRU_ATTACH: |