From owner-svn-src-stable-7@FreeBSD.ORG Tue Oct 14 08:44:27 2008 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8624106568E; Tue, 14 Oct 2008 08:44:27 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B5C2A8FC23; Tue, 14 Oct 2008 08:44:27 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9E8iRks000568; Tue, 14 Oct 2008 08:44:27 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9E8iR24000567; Tue, 14 Oct 2008 08:44:27 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200810140844.m9E8iR24000567@svn.freebsd.org> From: Robert Watson Date: Tue, 14 Oct 2008 08:44:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r183875 - in stable/7/sys: . kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Oct 2008 08:44:27 -0000 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)); }