Date: Tue, 14 Oct 2008 08:44:27 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r183875 - in stable/7/sys: . kern Message-ID: <200810140844.m9E8iR24000567@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rwatson Date: Tue Oct 14 08:44:27 2008 New Revision: 183875 URL: http://svn.freebsd.org/changeset/base/183875 Log: Merge r183664 from head to stable/7: Remove temporary debugging KASSERT's introduced to detect protocols improperly invoking sosend(), soreceive(), and sopoll() instead of attach either specialized or _generic() versions of those functions to their pru_sosend, pru_soreceive, and pru_sopoll protosw methods. Approved by: re (kib) Modified: stable/7/sys/ (props changed) stable/7/sys/kern/uipc_socket.c Modified: stable/7/sys/kern/uipc_socket.c ============================================================================== --- stable/7/sys/kern/uipc_socket.c Tue Oct 14 08:41:54 2008 (r183874) +++ stable/7/sys/kern/uipc_socket.c Tue Oct 14 08:44:27 2008 (r183875) @@ -1285,10 +1285,6 @@ sosend(struct socket *so, struct sockadd struct mbuf *top, struct mbuf *control, int flags, struct thread *td) { - /* XXXRW: Temporary debugging. */ - KASSERT(so->so_proto->pr_usrreqs->pru_sosend != sosend, - ("sosend: protocol calls sosend")); - return (so->so_proto->pr_usrreqs->pru_sosend(so, addr, uio, top, control, flags, td)); } @@ -2032,10 +2028,6 @@ soreceive(struct socket *so, struct sock struct mbuf **mp0, struct mbuf **controlp, int *flagsp) { - /* XXXRW: Temporary debugging. */ - KASSERT(so->so_proto->pr_usrreqs->pru_soreceive != soreceive, - ("soreceive: protocol calls soreceive")); - return (so->so_proto->pr_usrreqs->pru_soreceive(so, psa, uio, mp0, controlp, flagsp)); } @@ -2659,10 +2651,6 @@ sopoll(struct socket *so, int events, st struct thread *td) { - /* XXXRW: Temporary debugging. */ - KASSERT(so->so_proto->pr_usrreqs->pru_sopoll != sopoll, - ("sopoll: protocol calls sopoll")); - return (so->so_proto->pr_usrreqs->pru_sopoll(so, events, active_cred, td)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810140844.m9E8iR24000567>