diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2015-11-02 11:19:31 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2015-11-02 11:19:31 +0000 |
| commit | 40d7eafa4e28a2c68adaa06696ca614e43689704 (patch) | |
| tree | 3635c3e5d242d29ba169f94b79d444a2f528df50 /sys/net | |
| parent | 73b1bbb453ee03ef5fc031fd1ff6eba703c7468b (diff) | |
sppp_pick is unused, it can go away.
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_sppp.h | 3 | ||||
| -rw-r--r-- | sys/net/if_spppsubr.c | 22 |
2 files changed, 2 insertions, 23 deletions
diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h index 368f89fcf42..e3b02538910 100644 --- a/sys/net/if_sppp.h +++ b/sys/net/if_sppp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sppp.h,v 1.21 2015/09/30 09:45:20 sthen Exp $ */ +/* $OpenBSD: if_sppp.h,v 1.22 2015/11/02 11:19:30 dlg Exp $ */ /* $NetBSD: if_sppp.h,v 1.2.2.1 1999/04/04 06:57:39 explorer Exp $ */ /* @@ -229,7 +229,6 @@ void spppattach (struct ifnet *ifp); int sppp_ioctl(struct ifnet *ifp, u_long cmd, void *data); struct mbuf *sppp_dequeue (struct ifnet *ifp); -struct mbuf *sppp_pick(struct ifnet *ifp); int sppp_isempty (struct ifnet *ifp); void sppp_flush (struct ifnet *ifp); #endif /* _KERNEL */ diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index f444339adf7..891d4caa511 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_spppsubr.c,v 1.143 2015/10/25 11:58:11 mpi Exp $ */ +/* $OpenBSD: if_spppsubr.c,v 1.144 2015/11/02 11:19:30 dlg Exp $ */ /* * Synchronous PPP link level subroutines. * @@ -845,26 +845,6 @@ sppp_dequeue(struct ifnet *ifp) } /* - * Pick the next packet, do not remove it from the queue. - */ -struct mbuf * -sppp_pick(struct ifnet *ifp) -{ - struct sppp *sp = (struct sppp*)ifp; - struct mbuf *m; - int s; - - s = splnet(); - IF_POLL(&sp->pp_cpq, m); - if (m == NULL && - (sp->pp_phase == PHASE_NETWORK)) { - IFQ_POLL(&sp->pp_if.if_snd, m); - } - splx (s); - return (m); -} - -/* * Process an ioctl request. Called on low priority level. */ int |