diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2015-09-23 12:40:13 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2015-09-23 12:40:13 +0000 |
| commit | 8d909f1fb56e163dfdab00cb48c5152d556fa809 (patch) | |
| tree | 8b369d344fb4c09cc46da55788beb94031487ea0 /sys/net/if_trunk.h | |
| parent | f2d3d453c0513f4c911c3dcd826fd525a46ea503 (diff) | |
Remove trunk watchdog code since it doesn't do anything useful
and we want to limit the number of different places where we
access trunk port pointers.
trunk_watchdog should be never called as we don't set up it's
if_timer and trunk_port_watchdog just calls the if_watchdog
from the underlying interface.
It's possible that this is no longer needed due to if_slowtimo/
if_watchdog changes done earlier.
ok mpi
Diffstat (limited to 'sys/net/if_trunk.h')
| -rw-r--r-- | sys/net/if_trunk.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/net/if_trunk.h b/sys/net/if_trunk.h index e4eaffbd5da..05d731a3307 100644 --- a/sys/net/if_trunk.h +++ b/sys/net/if_trunk.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_trunk.h,v 1.24 2015/09/10 13:32:19 dlg Exp $ */ +/* $OpenBSD: if_trunk.h,v 1.25 2015/09/23 12:40:12 mikeb Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -139,7 +139,6 @@ struct trunk_port { void *dh_cookie; /* if detach hook */ /* Redirected callbacks */ - void (*tp_watchdog)(struct ifnet *); int (*tp_ioctl)(struct ifnet *, u_long, caddr_t); int (*tp_output)(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); @@ -194,7 +193,6 @@ struct trunk_softc { /* Trunk protocol callbacks */ int (*tr_detach)(struct trunk_softc *); int (*tr_start)(struct trunk_softc *, struct mbuf *); - int (*tr_watchdog)(struct trunk_softc *); int (*tr_input)(struct trunk_softc *, struct trunk_port *, struct mbuf *); int (*tr_port_create)(struct trunk_port *); |