diff options
| -rw-r--r-- | sys/netinet/tcp_usrreq.c | 15 | ||||
| -rw-r--r-- | sys/netinet/tcp_var.h | 6 | ||||
| -rw-r--r-- | sys/netinet/udp_usrreq.c | 16 | ||||
| -rw-r--r-- | sys/netinet/udp_var.h | 4 | ||||
| -rw-r--r-- | sys/netinet6/in6_proto.c | 6 |
5 files changed, 7 insertions, 40 deletions
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index c0918876e48..00997e16a02 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_usrreq.c,v 1.98 2008/05/23 15:51:12 thib Exp $ */ +/* $OpenBSD: tcp_usrreq.c,v 1.99 2008/05/24 19:48:32 thib Exp $ */ /* $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */ /* @@ -125,19 +125,6 @@ struct inpcbtable tcbtable; int tcp_ident(void *, size_t *, void *, size_t, int); -#ifdef INET6 -int -tcp6_usrreq(so, req, m, nam, control, p) - struct socket *so; - int req; - struct mbuf *m, *nam, *control; - struct proc *p; -{ - - return tcp_usrreq(so, req, m, nam, control, p); -} -#endif - /* * Process a TCP user request for TCP tb. If this is a send request * then m is the mbuf chain of send data. If this is a timer expiration diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index c707e1499bd..d197b088401 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_var.h,v 1.88 2008/05/23 15:51:12 thib Exp $ */ +/* $OpenBSD: tcp_var.h,v 1.89 2008/05/24 19:48:32 thib Exp $ */ /* $NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $ */ /* @@ -595,10 +595,6 @@ void tcp_trace(short, short, struct tcpcb *, caddr_t, int, int); struct tcpcb * tcp_usrclosed(struct tcpcb *); int tcp_sysctl(int *, u_int, void *, size_t *, void *, size_t); -#if defined(INET6) && !defined(TCP6) -int tcp6_usrreq(struct socket *, - int, struct mbuf *, struct mbuf *, struct mbuf *, struct proc *); -#endif int tcp_usrreq(struct socket *, int, struct mbuf *, struct mbuf *, struct mbuf *, struct proc *); void tcp_xmit_timer(struct tcpcb *, int); diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 088d9d50e3f..1d1838878c2 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp_usrreq.c,v 1.120 2008/05/23 15:51:12 thib Exp $ */ +/* $OpenBSD: udp_usrreq.c,v 1.121 2008/05/24 19:48:32 thib Exp $ */ /* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */ /* @@ -1001,20 +1001,6 @@ release: return (error); } -#ifdef INET6 -/*ARGSUSED*/ -int -udp6_usrreq(so, req, m, addr, control, p) - struct socket *so; - int req; - struct mbuf *m, *addr, *control; - struct proc *p; -{ - - return udp_usrreq(so, req, m, addr, control, p); -} -#endif - /*ARGSUSED*/ int udp_usrreq(so, req, m, addr, control, p) diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h index eaba606ca7f..5241be127db 100644 --- a/sys/netinet/udp_var.h +++ b/sys/netinet/udp_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: udp_var.h,v 1.18 2008/05/23 15:51:12 thib Exp $ */ +/* $OpenBSD: udp_var.h,v 1.19 2008/05/24 19:48:32 thib Exp $ */ /* $NetBSD: udp_var.h,v 1.12 1996/02/13 23:44:41 christos Exp $ */ /* @@ -105,8 +105,6 @@ extern struct udpstat udpstat; #if defined(INET6) && !defined(TCP6) void udp6_ctlinput(int, struct sockaddr *, void *); int udp6_input(struct mbuf **, int *, int); -int udp6_usrreq(struct socket *, - int, struct mbuf *, struct mbuf *, struct mbuf *, struct proc *); #endif /* INET6 && !TCP6 */ void *udp_ctlinput(int, struct sockaddr *, void *); void udp_init(void); diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index a74dd34b051..8c2f41fab16 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_proto.c,v 1.54 2008/05/06 08:47:36 markus Exp $ */ +/* $OpenBSD: in6_proto.c,v 1.55 2008/05/24 19:48:32 thib Exp $ */ /* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */ /* @@ -128,13 +128,13 @@ struct ip6protosw inet6sw[] = { }, { SOCK_DGRAM, &inet6domain, IPPROTO_UDP, PR_ATOMIC|PR_ADDR, udp6_input, 0, udp6_ctlinput, ip6_ctloutput, - udp6_usrreq, 0, + udp_usrreq, 0, 0, 0, 0, udp_sysctl, }, { SOCK_STREAM, &inet6domain, IPPROTO_TCP, PR_CONNREQUIRED|PR_WANTRCVD|PR_ABRTACPTDIS, tcp6_input, 0, tcp6_ctlinput, tcp_ctloutput, - tcp6_usrreq, + tcp_usrreq, #ifdef INET /* don't call initialization and timeout routines twice */ 0, 0, 0, 0, #else |