From owner-cvs-all@FreeBSD.ORG Sun Dec 5 22:08:38 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 10DB116A54D; Sun, 5 Dec 2004 22:08:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E24F643D5C; Sun, 5 Dec 2004 22:08:37 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB5M8bCH021064; Sun, 5 Dec 2004 22:08:37 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB5M8b24021063; Sun, 5 Dec 2004 22:08:37 GMT (envelope-from rwatson) Message-Id: <200412052208.iB5M8b24021063@repoman.freebsd.org> From: Robert Watson Date: Sun, 5 Dec 2004 22:08:37 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/netinet ip_output.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Dec 2004 22:08:38 -0000 rwatson 2004-12-05 22:08:37 UTC FreeBSD src repository Modified files: sys/netinet ip_output.c Log: Pass the inpcb reference into ip_getmoptions() rather than just the inp->inp_moptions pointer, so that ip_getmoptions() can perform necessary locking when doing non-atomic reads. Lock the inpcb by default to copy any data to local variables, then unlock before performing sooptcopyout(). MFC after: 2 weeks Revision Changes Path 1.236 +14 -6 src/sys/netinet/ip_output.c