From owner-cvs-src@FreeBSD.ORG Wed Mar 29 12:42:44 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0FE016A420; Wed, 29 Mar 2006 12:42:44 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C4F843D4C; Wed, 29 Mar 2006 12:42:44 +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 k2TCgiSv033092; Wed, 29 Mar 2006 12:42:44 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2TCgiRC033087; Wed, 29 Mar 2006 12:42:44 GMT (envelope-from rwatson) Message-Id: <200603291242.k2TCgiRC033087@repoman.freebsd.org> From: Robert Watson Date: Wed, 29 Mar 2006 12:42:43 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/netipx ipx_ip.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Mar 2006 12:42:44 -0000 rwatson 2006-03-29 12:42:43 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/netipx ipx_ip.c Log: Merge ip_ip.c:1.43,1.44 from HEAD to RELENG_6: When the kernel is compiled with options IPXIP, run the network stack with Giant, as there is current unsafety in the IPX tunneled over IP code. There have been no reports of trouble, but there probably would be if anyone were running this code at high speed on SMP systems. Include kernel.h to get NET_NEEDS_GIANT() definition, which for some reason compiled fine here. I may be running with other include file changes locally. Approved by: re (kensmith) Revision Changes Path 1.40.2.1 +3 -0 src/sys/netipx/ipx_ip.c