diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2014-04-19 15:54:40 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2014-04-19 15:54:40 +0000 |
| commit | 264ed576300e3026b0209c4979abd3be832095d4 (patch) | |
| tree | de4ffb55b3e171433976c579aa4073d4d7d6f642 /sys/net | |
| parent | 68a2d4459b5a05aef1ff7e402fa24f3f6222aa18 (diff) | |
minus altq tentacles, plus missing IF_DROP here as well
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/bridgestp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index faee3486ef0..3217eb8cb5d 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bridgestp.c,v 1.46 2013/10/20 08:48:39 deraadt Exp $ */ +/* $OpenBSD: bridgestp.c,v 1.47 2014/04/19 15:54:39 henning Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -484,11 +484,10 @@ bstp_send_bpdu(struct bstp_state *bs, struct bstp_port *bp, if (ifp == NULL || (ifp->if_flags & IFF_RUNNING) == 0) goto done; -#ifdef ALTQ - if (!ALTQ_IS_ENABLED(&ifp->if_snd)) -#endif - if (IF_QFULL(&ifp->if_snd)) + if (IF_QFULL(&ifp->if_snd)) { + IF_DROP(&ifp->if_snd); goto done; + } MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) |