From owner-svn-src-stable@FreeBSD.ORG  Fri Dec 10 14:07:09 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 7EF0E10656A3;
	Fri, 10 Dec 2010 14:07:09 +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 3B35A8FC29;
	Fri, 10 Dec 2010 14:07: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 oBAE79Gl076236;
	Fri, 10 Dec 2010 14:07:09 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBAE79Qn076234;
	Fri, 10 Dec 2010 14:07:09 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201012101407.oBAE79Qn076234@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Fri, 10 Dec 2010 14:07:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216357 - stable/7/sys/netinet
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: Fri, 10 Dec 2010 14:07:09 -0000

Author: bz
Date: Fri Dec 10 14:07:08 2010
New Revision: 216357
URL: http://svn.freebsd.org/changeset/base/216357

Log:
  MFC r216192:
  
    Use correct field to track statistics counting error as bad header length.
    This assimilates the code to what ip_input has been doing since r1.1 in
    this case.
  
    Submitted by: Rozhuk Ivan (rozhuk.im gmail.com)
  
  Approved by:	re (kib)

Modified:
  stable/7/sys/netinet/ip_fastfwd.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/netinet/ip_fastfwd.c
==============================================================================
--- stable/7/sys/netinet/ip_fastfwd.c	Fri Dec 10 14:06:50 2010	(r216356)
+++ stable/7/sys/netinet/ip_fastfwd.c	Fri Dec 10 14:07:08 2010	(r216357)
@@ -215,7 +215,7 @@ ip_fastforward(struct mbuf *m)
 	 */
 	hlen = ip->ip_hl << 2;
 	if (hlen < sizeof(struct ip)) {	/* minimum header length */
-		ipstat.ips_badlen++;
+		ipstat.ips_badhlen++;
 		goto drop;
 	}
 	if (hlen > m->m_len) {