diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2011-07-06 02:49:37 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2011-07-06 02:49:37 +0000 |
| commit | f490234c4ca430fa3cf2703a2910d03cdd226939 (patch) | |
| tree | e6b415b1d0b54946b14d7a8b3b24c46acb5bad0d | |
| parent | 1a89f467197b52dbc105d9fb9b7aef6a030434a1 (diff) | |
second trial: stop messing with ifq internals, this time use IF_IS_EMPTY
and not IFQ_IS_EMPTY, the former doesn't get overloaded with altq-specific
stuffz. original oks from claudio and ryan and bluhm, i take the liberty
to assume the oks for this fixed version
| -rw-r--r-- | sys/net/if_spppsubr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 837c0ada7d0..db5ba1e2929 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_spppsubr.c,v 1.91 2011/07/06 02:42:28 henning Exp $ */ +/* $OpenBSD: if_spppsubr.c,v 1.92 2011/07/06 02:49:36 henning Exp $ */ /* * Synchronous PPP/Cisco link level subroutines. * Keepalive protocol implemented in both Cisco and PPP modes. @@ -1011,7 +1011,7 @@ sppp_isempty(struct ifnet *ifp) int empty, s; s = splnet(); - empty = !sp->pp_fastq.ifq_head && !sp->pp_cpq.ifq_head && + empty = IF_IS_EMPTY(&sp->pp_fastq) && IF_IS_EMPTY(&sp->pp_cpq) && IFQ_IS_EMPTY(&sp->pp_if.if_snd); splx(s); return (empty); |