From owner-svn-src-all@FreeBSD.ORG  Sat Jan 15 19:02:09 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4EE9F106564A;
	Sat, 15 Jan 2011 19:02:09 +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 3DD408FC15;
	Sat, 15 Jan 2011 19:02:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0FJ29D4034033;
	Sat, 15 Jan 2011 19:02:09 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0FJ29XM034031;
	Sat, 15 Jan 2011 19:02:09 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201101151902.p0FJ29XM034031@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 15 Jan 2011 19:02:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217449 - stable/8/sys/net
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Jan 2011 19:02:09 -0000

Author: rwatson
Date: Sat Jan 15 19:02:08 2011
New Revision: 217449
URL: http://svn.freebsd.org/changeset/base/217449

Log:
  Merge r204208 from head to stable/8:
  
    Fix constant assignment for netisr protocol information sysctl.
  
    Spotted by:     bz

Modified:
  stable/8/sys/net/netisr.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/net/netisr.h
==============================================================================
--- stable/8/sys/net/netisr.h	Sat Jan 15 19:00:22 2011	(r217448)
+++ stable/8/sys/net/netisr.h	Sat Jan 15 19:02:08 2011	(r217449)
@@ -92,7 +92,7 @@ struct sysctl_netisr_proto {
  */
 #define	NETISR_SNP_FLAGS_M2FLOW		0x00000001	/* nh_m2flow */
 #define	NETISR_SNP_FLAGS_M2CPUID	0x00000002	/* nh_m2cpuid */
-#define	NETISR_SNP_FLAGS_DRAINEDCPU	0x00000003	/* nh_drainedcpu */
+#define	NETISR_SNP_FLAGS_DRAINEDCPU	0x00000004	/* nh_drainedcpu */
 
 /*
  * Next, a structure per-workstream, with per-protocol data, exported as