diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2014-04-19 12:28:00 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2014-04-19 12:28:00 +0000 |
| commit | f6518f3f1cc2c51d4978f5d54782819447a3e22b (patch) | |
| tree | e73ea9f3c8bf6e97f068f40e718c0635a63d2cd9 /sys | |
| parent | 2a3669b75240a3b1c3fbb882d4cf6fb7f000f968 (diff) | |
remove the altq enable/attach and disable/detach bits
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/if.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 12a37ec4b2b..4f7db461410 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.283 2014/04/10 13:47:21 mpi Exp $ */ +/* $OpenBSD: if.c,v 1.284 2014/04/19 12:27:59 henning Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -282,13 +282,6 @@ if_attachsetup(struct ifnet *ifp) if (ifp->if_snd.ifq_maxlen == 0) IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); -#ifdef ALTQ - ifp->if_snd.altq_type = 0; - ifp->if_snd.altq_disc = NULL; - ifp->if_snd.altq_flags &= ALTQF_CANTCHANGE; - ifp->if_snd.altq_tbr = NULL; - ifp->if_snd.altq_ifp = ifp; -#endif if (domains) if_attachdomain1(ifp); @@ -536,12 +529,6 @@ if_detach(struct ifnet *ifp) #if NBPFILTER > 0 bpfdetach(ifp); #endif -#ifdef ALTQ - if (ALTQ_IS_ENABLED(&ifp->if_snd)) - altq_disable(&ifp->if_snd); - if (ALTQ_IS_ATTACHED(&ifp->if_snd)) - altq_detach(&ifp->if_snd); -#endif rt_if_remove(ifp); #ifdef INET rti_delete(ifp); |