From owner-svn-src-head@FreeBSD.ORG Thu Nov 19 18:11:24 2009 Return-Path: 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 43B2E106568F; Thu, 19 Nov 2009 18:11:24 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1899D8FC1C; Thu, 19 Nov 2009 18:11:24 +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 nAJIBNI1014363; Thu, 19 Nov 2009 18:11:23 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAJIBNU4014359; Thu, 19 Nov 2009 18:11:23 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200911191811.nAJIBNU4014359@svn.freebsd.org> From: John Baldwin Date: Thu, 19 Nov 2009 18:11:23 +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: r199537 - in head/sys: arm/at91 dev/nxge dev/wl 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2009 18:11:24 -0000 Author: jhb Date: Thu Nov 19 18:11:23 2009 New Revision: 199537 URL: http://svn.freebsd.org/changeset/base/199537 Log: These drivers only set if_timer but never set if_watchdog. Just remove the assignments to if_timer. Modified: head/sys/arm/at91/if_ate.c head/sys/dev/nxge/if_nxge.c head/sys/dev/wl/if_wl.c Modified: head/sys/arm/at91/if_ate.c ============================================================================== --- head/sys/arm/at91/if_ate.c Thu Nov 19 16:27:51 2009 (r199536) +++ head/sys/arm/at91/if_ate.c Thu Nov 19 18:11:23 2009 (r199537) @@ -276,7 +276,6 @@ ate_attach(device_t dev) IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; IFQ_SET_READY(&ifp->if_snd); - ifp->if_timer = 0; ifp->if_linkmib = &sc->mibdata; ifp->if_linkmiblen = sizeof(sc->mibdata); sc->mibdata.dot3Compliance = DOT3COMPLIANCE_COLLS; @@ -999,7 +998,6 @@ atestop(struct ate_softc *sc) ATE_ASSERT_LOCKED(sc); ifp = sc->ifp; if (ifp) { - ifp->if_timer = 0; ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); } Modified: head/sys/dev/nxge/if_nxge.c ============================================================================== --- head/sys/dev/nxge/if_nxge.c Thu Nov 19 16:27:51 2009 (r199536) +++ head/sys/dev/nxge/if_nxge.c Thu Nov 19 18:11:23 2009 (r199537) @@ -2946,7 +2946,6 @@ xge_flush_txds(xge_hal_channel_h channel struct ifnet *ifnetp = lldev->ifnetp; u8 t_code; - ifnetp->if_timer = 0; while(xge_hal_fifo_dtr_next_completed(channelh, &tx_dtr, &t_code) == XGE_HAL_OK) { XGE_DRV_STATS(tx_desc_compl); @@ -3105,7 +3104,6 @@ _exit1: XGE_DRV_STATS(tx_again); _exit: - ifnetp->if_timer = 15; } /** @@ -3269,8 +3267,6 @@ xge_tx_compl(xge_hal_channel_h channelh, XGE_DRV_STATS(tx_completions); - ifnetp->if_timer = 0; - /* * For each completed descriptor: Get private structure, free buffer, * do unmapping, and free descriptor Modified: head/sys/dev/wl/if_wl.c ============================================================================== --- head/sys/dev/wl/if_wl.c Thu Nov 19 16:27:51 2009 (r199536) +++ head/sys/dev/wl/if_wl.c Thu Nov 19 18:11:23 2009 (r199537) @@ -559,10 +559,8 @@ wlattach(device_t device) ifp->if_init = wlinit; ifp->if_start = wlstart; ifp->if_ioctl = wlioctl; - ifp->if_timer = 0; /* paranoia */ ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; /* no entries - ifp->if_watchdog ifp->if_done ifp->if_reset */