From owner-svn-src-all@FreeBSD.ORG Mon Jan 11 17:29:20 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 953471065670; Mon, 11 Jan 2010 17:29:20 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 840A08FC16; Mon, 11 Jan 2010 17:29:20 +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 o0BHTKuf026945; Mon, 11 Jan 2010 17:29:20 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0BHTKKT026943; Mon, 11 Jan 2010 17:29:20 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201001111729.o0BHTKKT026943@svn.freebsd.org> From: Warner Losh Date: Mon, 11 Jan 2010 17:29:20 +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: r202092 - head/sys/mips/rmi/dev/xlr X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2010 17:29:20 -0000 Author: imp Date: Mon Jan 11 17:29:20 2010 New Revision: 202092 URL: http://svn.freebsd.org/changeset/base/202092 Log: Correct a path in an include I missed earlier Remove references to if_watchdog. The rge_watchdog routine was empty anyway. Modified: head/sys/mips/rmi/dev/xlr/rge.c Modified: head/sys/mips/rmi/dev/xlr/rge.c ============================================================================== --- head/sys/mips/rmi/dev/xlr/rge.c Mon Jan 11 17:16:06 2010 (r202091) +++ head/sys/mips/rmi/dev/xlr/rge.c Mon Jan 11 17:29:20 2010 (r202092) @@ -102,7 +102,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include /* #include "opt_rge.h" */ @@ -245,7 +245,6 @@ static void rge_start(struct ifnet *); static int rge_ioctl(struct ifnet *, u_long, caddr_t); static void rge_init(void *); static void rge_stop(struct rge_softc *); -static void rge_watchdog(struct ifnet *); static int rge_shutdown(device_t); static void rge_reset(struct rge_softc *); @@ -1936,7 +1935,6 @@ rge_attach(device_t dev) ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = rge_ioctl; ifp->if_start = rge_start; - ifp->if_watchdog = rge_watchdog; ifp->if_init = rge_init; ifp->if_mtu = ETHERMTU; ifp->if_snd.ifq_drv_maxlen = RGE_TX_Q_SIZE; @@ -2404,11 +2402,6 @@ rge_stop(struct rge_softc *sc) rmi_xlr_mac_close(sc); } -static void -rge_watchdog(struct ifnet *sc) -{ -} - static int rge_shutdown(device_t dev) {