d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some more leftover from the old pfaltq_module hack to allow for

Browse Source 
kernels w/ pf, but w/o altq.

Reported-by:	 Xin LI
This commit is contained in:
mlaier 2004-06-14 16:13:05 +00:00
parent c8b9db3b58
commit 0633de661d
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/contrib/pf/net/if_pflog.c
View File

@ -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);

16
sys/contrib/pf/net/if_pfsync.c
View File

@ -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);