From owner-svn-src-stable@FreeBSD.ORG  Fri Oct  8 19:25:47 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 529A4106566B;
	Fri,  8 Oct 2010 19:25:47 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 41EB58FC0A;
	Fri,  8 Oct 2010 19:25:47 +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 o98JPlkg006781;
	Fri, 8 Oct 2010 19:25:47 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o98JPlI1006779;
	Fri, 8 Oct 2010 19:25:47 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201010081925.o98JPlI1006779@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Fri, 8 Oct 2010 19:25:47 +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: r213602 - stable/7/sys/dev/et
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, 08 Oct 2010 19:25:47 -0000

Author: yongari
Date: Fri Oct  8 19:25:46 2010
New Revision: 213602
URL: http://svn.freebsd.org/changeset/base/213602

Log:
  MFC r212969:
    Make sure to clear IFF_DRV_RUNNING to reinitialize controller.
    While I'm here update if_oerrors counter when driver encounters
    watchdog timeout.

Modified:
  stable/7/sys/dev/et/if_et.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/dev/et/if_et.c
==============================================================================
--- stable/7/sys/dev/et/if_et.c	Fri Oct  8 19:24:38 2010	(r213601)
+++ stable/7/sys/dev/et/if_et.c	Fri Oct  8 19:25:46 2010	(r213602)
@@ -1320,6 +1320,8 @@ et_watchdog(struct et_softc *sc)
 
 	if_printf(sc->ifp, "watchdog timed out\n");
 
+	sc->ifp->if_oerrors++;
+	sc->ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	et_init_locked(sc);
 	et_start_locked(sc->ifp);
 }