From owner-freebsd-stable@FreeBSD.ORG  Mon Sep 26 17:17:29 2005
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
X-Original-To: freebsd-stable@freebsd.org
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 85B6816A420
	for <freebsd-stable@freebsd.org>; Mon, 26 Sep 2005 17:17:29 +0000 (GMT)
	(envelope-from emaste@phaedrus.sandvine.ca)
Received: from mailserver.sandvine.com (sandvine.com [199.243.201.138])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CFFD943D53
	for <freebsd-stable@freebsd.org>; Mon, 26 Sep 2005 17:17:28 +0000 (GMT)
	(envelope-from emaste@phaedrus.sandvine.ca)
Received: from labgw2.phaedrus.sandvine.com ([192.168.3.11]) by
	mailserver.sandvine.com with Microsoft SMTPSVC(5.0.2195.6713); 
	Mon, 26 Sep 2005 13:17:25 -0400
Received: by labgw2.phaedrus.sandvine.com (Postfix, from userid 12627)
	id 8DEC013635; Mon, 26 Sep 2005 13:17:27 -0400 (EDT)
Date: Mon, 26 Sep 2005 13:17:27 -0400
From: Ed Maste <emaste@phaedrus.sandvine.ca>
To: freebsd-stable@freebsd.org
Message-ID: <20050926171727.GA95971@sandvine.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="p4qYPpj5QlsIQJ0K"
Content-Disposition: inline
User-Agent: Mutt/1.4.2.1i
X-OriginalArrivalTime: 26 Sep 2005 17:17:25.0117 (UTC)
	FILETIME=[29D29AD0:01C5C2BE]
Subject: [PATCH] options NET_WITH_GIANT has no effect on 5.x
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Sep 2005 17:17:29 -0000


--p4qYPpj5QlsIQJ0K
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

I tried to build a kernel with options NET_WITH_GIANT and discovered
that debug_mpsafenet is still set to 1.  It seems that when this was
MFC'd the #include "opt_net.h" was missed; the attached patch should
correct this.

--
Ed Maste, Sandvine Incorporated

--p4qYPpj5QlsIQJ0K
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="netisr.c.patch"

Index: netisr.c
===================================================================
RCS file: /usr/cvs/src/sys/net/netisr.c,v
retrieving revision 1.10.2.3
diff -u -3 -r1.10.2.3 netisr.c
--- netisr.c	14 Oct 2004 19:19:24 -0000	1.10.2.3
+++ netisr.c	26 Sep 2005 17:07:14 -0000
@@ -27,6 +27,8 @@
  * $FreeBSD$
  */
 
+#include "opt_net.h"
+
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/rtprio.h>

--p4qYPpj5QlsIQJ0K--