Remove some more leftover from the old pfaltq_module hack to allow for
kernels w/ pf, but w/o altq. Reported-by: Xin LI
This commit is contained in:
parent
c4d297d20d
commit
4e6d06effe
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=130475
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user