diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-08-27 17:08:02 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-08-27 17:08:02 +0000 |
| commit | e8ad753752758c2cfa85f8c08dd41f982b096c56 (patch) | |
| tree | 8bb7235dfdb22a9f3ab77b7a8eb911512da40831 /sys/net | |
| parent | c766b87a799f8e51a14cd8938bbceb1dfe2b3d80 (diff) | |
remove the unused if_init callback in struct ifnet
ok deraadt@ henning@ claudio@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if.c | 10 | ||||
| -rw-r--r-- | sys/net/if.h | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 156b9e94992..f34ed4a58d6 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.224 2010/08/25 14:07:24 claudio Exp $ */ +/* $OpenBSD: if.c,v 1.225 2010/08/27 17:08:01 jsg Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -141,7 +141,6 @@ int ifqmaxlen = IFQ_MAXLEN; void if_detach_queues(struct ifnet *, struct ifqueue *); void if_detached_start(struct ifnet *); int if_detached_ioctl(struct ifnet *, u_long, caddr_t); -int if_detached_init(struct ifnet *); void if_detached_watchdog(struct ifnet *); int if_getgroup(caddr_t, struct ifnet *); @@ -521,7 +520,6 @@ if_detach(struct ifnet *ifp) ifp->if_flags &= ~IFF_OACTIVE; ifp->if_start = if_detached_start; ifp->if_ioctl = if_detached_ioctl; - ifp->if_init = if_detached_init; ifp->if_watchdog = if_detached_watchdog; /* Call detach hooks, ie. to remove vlan interfaces */ @@ -1799,12 +1797,6 @@ if_detached_ioctl(struct ifnet *ifp, u_long a, caddr_t b) return ENODEV; } -int -if_detached_init(struct ifnet *ifp) -{ - return (ENXIO); -} - void if_detached_watchdog(struct ifnet *ifp) { diff --git a/sys/net/if.h b/sys/net/if.h index b1d880376b8..f28e6f397f5 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if.h,v 1.117 2010/06/26 19:49:54 claudio Exp $ */ +/* $OpenBSD: if.h,v 1.118 2010/08/27 17:08:01 jsg Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -274,8 +274,6 @@ struct ifnet { /* and the entries */ void (*if_start)(struct ifnet *); /* ioctl routine */ int (*if_ioctl)(struct ifnet *, u_long, caddr_t); - /* init routine */ - int (*if_init)(struct ifnet *); /* stop routine */ int (*if_stop)(struct ifnet *, int); /* timer routine */ |