From owner-cvs-src-old@FreeBSD.ORG  Tue Dec 14 20:01:08 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 857FD10656EA
	for <cvs-src-old@freebsd.org>; Tue, 14 Dec 2010 20:01:08 +0000 (UTC)
	(envelope-from jfv@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 585EF8FC14
	for <cvs-src-old@freebsd.org>; Tue, 14 Dec 2010 20:01:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id oBEK18Ug040767
	for <cvs-src-old@freebsd.org>; Tue, 14 Dec 2010 20:01:08 GMT
	(envelope-from jfv@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id oBEK18pB040766
	for cvs-src-old@freebsd.org; Tue, 14 Dec 2010 20:01:08 GMT
	(envelope-from jfv@repoman.freebsd.org)
Message-Id: <201012142001.oBEK18pB040766@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	jfv@repoman.freebsd.org using -f
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Tue, 14 Dec 2010 20:00:55 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7
Subject: cvs commit: src/sys/dev/e1000 if_em.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Dec 2010 20:01:08 -0000

jfv         2010-12-14 20:00:55 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/dev/e1000        if_em.c 
  Log:
  SVN rev 216441 on 2010-12-14 20:00:55Z by jfv
  
  MFC r216172, r216176
  
  Correct the RX discard and refresh_mbuf logic to match igb, the old
  discard code could cause panics due to a bad pointer, now simply
  have discard always free mbufs and depend on refresh. In the refresh
  code, make sure the mbuf and soft buf struct are properly reset.
  
  Approved by: re
  
  Revision  Changes    Path
  1.1.2.16  +32 -37    src/sys/dev/e1000/if_em.c