From owner-svn-src-stable@FreeBSD.ORG  Sun Oct 31 16:54:50 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C61D21065693;
	Sun, 31 Oct 2010 16:54:50 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B4B558FC17;
	Sun, 31 Oct 2010 16:54:50 +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 o9VGso9q097009;
	Sun, 31 Oct 2010 16:54:50 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9VGsoCQ097007;
	Sun, 31 Oct 2010 16:54:50 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201010311654.o9VGsoCQ097007@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 31 Oct 2010 16:54:50 +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: r214602 - stable/8/sys/net
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Oct 2010 16:54:50 -0000

Author: bz
Date: Sun Oct 31 16:54:50 2010
New Revision: 214602
URL: http://svn.freebsd.org/changeset/base/214602

Log:
  Correct a merge issue from r214554, where the field had been deprecated
  and reserved in HEAD but is still there in 8.
  
  Reported by:	dhw

Modified:
  stable/8/sys/net/if_debug.c

Modified: stable/8/sys/net/if_debug.c
==============================================================================
--- stable/8/sys/net/if_debug.c	Sun Oct 31 15:07:09 2010	(r214601)
+++ stable/8/sys/net/if_debug.c	Sun Oct 31 16:54:50 2010	(r214602)
@@ -62,7 +62,7 @@ if_show_ifnet(struct ifnet *ifp)
 	IF_DB_PRINTF("%s", if_description);
 	IF_DB_PRINTF("%u", if_index);
 	IF_DB_PRINTF("%u", if_refcount);
-	IF_DB_PRINTF("%d", if_index_reserved);
+	IF_DB_PRINTF("%u", if_timer);
 	IF_DB_PRINTF("%p", if_softc);
 	IF_DB_PRINTF("%p", if_l2com);
 	IF_DB_PRINTF("%p", if_vnet);