diff options
| author | jhb <jhb@FreeBSD.org> | 2009-11-19 18:11:23 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2009-11-19 18:11:23 +0000 |
| commit | 680691ac7237fea5f2e6b3085a067e698eba44ee (patch) | |
| tree | f3ccaf9c2932c8178211ffe6244da4844f8ba59a | |
| parent | 9aa490f096ff30310ba6a6a03699e8ccc2efe2c9 (diff) | |
| download | FreeBSD-src-680691ac7237fea5f2e6b3085a067e698eba44ee.zip FreeBSD-src-680691ac7237fea5f2e6b3085a067e698eba44ee.tar.gz | |
These drivers only set if_timer but never set if_watchdog. Just remove
the assignments to if_timer.
| -rw-r--r-- | sys/arm/at91/if_ate.c | 2 | ||||
| -rw-r--r-- | sys/dev/nxge/if_nxge.c | 4 | ||||
| -rw-r--r-- | sys/dev/wl/if_wl.c | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/sys/arm/at91/if_ate.c b/sys/arm/at91/if_ate.c index ec4771c..bde7fb9 100644 --- a/sys/arm/at91/if_ate.c +++ b/sys/arm/at91/if_ate.c @@ -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); } diff --git a/sys/dev/nxge/if_nxge.c b/sys/dev/nxge/if_nxge.c index 129ccb5..d2fab43 100644 --- a/sys/dev/nxge/if_nxge.c +++ b/sys/dev/nxge/if_nxge.c @@ -2946,7 +2946,6 @@ xge_flush_txds(xge_hal_channel_h channelh) 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 diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c index e773fd3..ed291ed 100644 --- a/sys/dev/wl/if_wl.c +++ b/sys/dev/wl/if_wl.c @@ -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 */ |
