diff options
author | jhb <jhb@FreeBSD.org> | 2009-11-19 18:21:51 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2009-11-19 18:21:51 +0000 |
commit | 4ba3c79b59a632c50b603118ca52aa1141c73e20 (patch) | |
tree | 7d4ac6df6f2bcf8cafe98b7d4e597d7c69c708cb /sys/dev/lmc/if_lmc.h | |
parent | 680691ac7237fea5f2e6b3085a067e698eba44ee (diff) | |
download | FreeBSD-src-4ba3c79b59a632c50b603118ca52aa1141c73e20.zip FreeBSD-src-4ba3c79b59a632c50b603118ca52aa1141c73e20.tar.gz |
This driver has two modes, a netgraph mode and an ifnet mode. In the
netgraph mode it used a private timer to drive the transmit watchdog. In
the ifnet mode it used if_watchdog. Now it always uses the private timer.
Diffstat (limited to 'sys/dev/lmc/if_lmc.h')
-rw-r--r-- | sys/dev/lmc/if_lmc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/lmc/if_lmc.h b/sys/dev/lmc/if_lmc.h index fb34e03..0212f51 100644 --- a/sys/dev/lmc/if_lmc.h +++ b/sys/dev/lmc/if_lmc.h @@ -1140,7 +1140,6 @@ struct softc #endif #if NETGRAPH - struct callout ng_callout; /* ng_watchdog needs this */ node_p ng_node; /* pointer to our node struct */ hook_p ng_hook; /* non-zero means NETGRAPH owns device */ # if (__FreeBSD_version >= 503000) @@ -1153,6 +1152,7 @@ struct softc #endif #ifdef __FreeBSD__ + struct callout callout; /* watchdog needs this */ struct device *dev; /* base device pointer */ bus_space_tag_t csr_tag; /* bus_space needs this */ bus_space_handle_t csr_handle;/* bus_space_needs this */ @@ -1596,7 +1596,6 @@ static int lmc_ifnet_ioctl(struct ifnet *, u_long, caddr_t); static void lmc_ifnet_start(struct ifnet *); static int lmc_raw_output(struct ifnet *, struct mbuf *, struct sockaddr *, struct route *); -static void lmc_ifnet_watchdog(struct ifnet *); # ifdef __OpenBSD__ static int ifmedia_change(struct ifnet *); static void ifmedia_status(struct ifnet *, struct ifmediareq *); |