From owner-svn-src-head@FreeBSD.ORG  Sun Dec 13 20:27:59 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D64381065780;
	Sun, 13 Dec 2009 20:27:59 +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 C64A88FC1B;
	Sun, 13 Dec 2009 20:27:59 +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 nBDKRxxS096364;
	Sun, 13 Dec 2009 20:27:59 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBDKRxHp096362;
	Sun, 13 Dec 2009 20:27:59 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200912132027.nBDKRxHp096362@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 13 Dec 2009 20:27:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200484 - head/sys/mips/adm5120
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Dec 2009 20:27:59 -0000

Author: bz
Date: Sun Dec 13 20:27:59 2009
New Revision: 200484
URL: http://svn.freebsd.org/changeset/base/200484

Log:
  Make admsw(4) compile again fixing typos and adding the missing variable
  after r199762.

Modified:
  head/sys/mips/adm5120/if_admsw.c

Modified: head/sys/mips/adm5120/if_admsw.c
==============================================================================
--- head/sys/mips/adm5120/if_admsw.c	Sun Dec 13 20:27:46 2009	(r200483)
+++ head/sys/mips/adm5120/if_admsw.c	Sun Dec 13 20:27:59 2009	(r200484)
@@ -745,10 +745,11 @@ static void
 admsw_watchdog(void *arg)
 {
 	struct admsw_softc *sc = arg;
+	struct ifnet *ifp;
 	int vlan;
 
-	callout_reset(&sc->watchdog, hz, admsw_watchdog, sc);
-	if (sc->sc_timer == 0 || --sc->timer > 0)
+	callout_reset(&sc->sc_watchdog, hz, admsw_watchdog, sc);
+	if (sc->sc_timer == 0 || --sc->sc_timer > 0)
 		return;
 
 	/* Check if an interrupt was lost. */
@@ -775,6 +776,8 @@ admsw_watchdog(void *arg)
 		admsw_stop(sc->sc_ifnet[vlan], 0);
 	admsw_init(sc);
 
+	ifp = sc->sc_ifnet[0];
+
 	/* Try to get more packets going. */
 	admsw_start(ifp);
 }