From owner-p4-projects@FreeBSD.ORG  Sun Dec 10 06:42:24 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A5ABA16A416; Sun, 10 Dec 2006 06:42:24 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7F8FD16A412
	for <perforce@freebsd.org>; Sun, 10 Dec 2006 06:42:24 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B931643C9F
	for <perforce@freebsd.org>; Sun, 10 Dec 2006 06:41:15 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBA6gOXU098707
	for <perforce@freebsd.org>; Sun, 10 Dec 2006 06:42:24 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBA6gNCq098702
	for perforce@freebsd.org; Sun, 10 Dec 2006 06:42:23 GMT
	(envelope-from imp@freebsd.org)
Date: Sun, 10 Dec 2006 06:42:23 GMT
Message-Id: <200612100642.kBA6gNCq098702@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111382 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Dec 2006 06:42:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=111382

Change 111382 by imp@imp_lighthouse on 2006/12/10 06:42:15

	Remove watchdog that we weren't using anyway.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/if_ate.c#64 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#64 (text+ko) ====

@@ -132,7 +132,6 @@
 static void ateinit(void *);
 static void atestart(struct ifnet *);
 static void atestop(struct ate_softc *);
-static void atewatchdog(struct ifnet *);
 static int ateioctl(struct ifnet * ifp, u_long, caddr_t);
 
 /* bus entry points */
@@ -208,7 +207,6 @@
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_start = atestart;
 	ifp->if_ioctl = ateioctl;
-	ifp->if_watchdog = atewatchdog;
 	ifp->if_init = ateinit;
 	ifp->if_baudrate = 10000000;
 	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
@@ -910,18 +908,6 @@
 	 */
 }
 
-static void
-atewatchdog(struct ifnet *ifp)
-{
-	struct ate_softc *sc = ifp->if_softc;
-
-	ATE_LOCK(sc);
-	device_printf(sc->dev, "Device timeout\n");
-	ifp->if_oerrors++;
-	ateinit_locked(sc);
-	ATE_UNLOCK(sc);
-}
-
 static int
 ateioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {