diff options
| author | mlaier <mlaier@FreeBSD.org> | 2004-06-14 16:13:05 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2004-06-14 16:13:05 +0000 |
| commit | 0633de661d28c6cdc71e9076d4491f41434e3400 (patch) | |
| tree | 0a53f74f98a4eb7eff4f702a6eea6ef561c407ba /sys/contrib | |
| parent | c8b9db3b58e43c13098ec0aa6688694fdfa8c478 (diff) | |
| download | FreeBSD-src-0633de661d28c6cdc71e9076d4491f41434e3400.zip FreeBSD-src-0633de661d28c6cdc71e9076d4491f41434e3400.tar.gz | |
Remove some more leftover from the old pfaltq_module hack to allow for
kernels w/ pf, but w/o altq.
Reported-by: Xin LI
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/pf/net/if_pflog.c | 16 | ||||
| -rw-r--r-- | sys/contrib/pf/net/if_pfsync.c | 16 |
2 files changed, 8 insertions, 24 deletions
diff --git a/sys/contrib/pf/net/if_pflog.c b/sys/contrib/pf/net/if_pflog.c index 5da1b30..13f6a6c 100644 --- a/sys/contrib/pf/net/if_pflog.c +++ b/sys/contrib/pf/net/if_pflog.c @@ -218,23 +218,15 @@ void pflogstart(struct ifnet *ifp) { struct mbuf *m; -#if defined(__FreeBSD__) && defined(ALTQ) - struct ifaltq *ifq; -#else - struct ifqueue *ifq; -#endif int s; -#ifdef __FreeBSD__ - ifq = &ifp->if_snd; -#endif for (;;) { s = splimp(); #ifdef __FreeBSD__ - IF_LOCK(ifq); - _IF_DROP(ifq); - _IF_DEQUEUE(ifq, m); - IF_UNLOCK(ifq); + IF_LOCK(&ifp->if_snd); + _IF_DROP(&ifp->if_snd); + _IF_DEQUEUE(&ifp->if_snd, m); + IF_UNLOCK(&ifp->if_snd); #else IF_DROP(&ifp->if_snd); IF_DEQUEUE(&ifp->if_snd, m); diff --git a/sys/contrib/pf/net/if_pfsync.c b/sys/contrib/pf/net/if_pfsync.c index 9281ce2..06eb4b0 100644 --- a/sys/contrib/pf/net/if_pfsync.c +++ b/sys/contrib/pf/net/if_pfsync.c @@ -218,23 +218,15 @@ void pfsyncstart(struct ifnet *ifp) { struct mbuf *m; -#if defined(__FreeBSD__) && defined(ALTQ) - struct ifaltq *ifq; -#else - struct ifqueue *ifq; -#endif int s; -#ifdef __FreeBSD__ - ifq = &ifp->if_snd; -#endif for (;;) { s = splimp(); #ifdef __FreeBSD__ - IF_LOCK(ifq); - _IF_DROP(ifq); - _IF_DEQUEUE(ifq, m); - IF_UNLOCK(ifq); + IF_LOCK(&ifp->if_snd); + _IF_DROP(&ifp->if_snd); + _IF_DEQUEUE(&ifp->if_snd, m); + IF_UNLOCK(&ifp->if_snd); #else IF_DROP(&ifp->if_snd); IF_DEQUEUE(&ifp->if_snd, m); |
