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

Move the protocol and port count checks to outside the loop, these conditions

Browse Source 
can not change while we have the lock so no point retesting.
This commit is contained in:
Andrew Thompson 2008-09-18 20:56:35 +00:00
parent 4e63215ba8
commit 149bac03d9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=183160
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/net/if_lagg.c
View File

@ -1116,6 +1116,13 @@ lagg_start(struct ifnet *ifp)
int error = 0;
LAGG_RLOCK(sc);
/* We need a Tx algorithm and at least one port */
if (sc->sc_proto == LAGG_PROTO_NONE || sc->sc_count == 0) {
IF_DRAIN(&ifp->if_snd);
LAGG_RUNLOCK(sc);
return;
}
for (;; error = 0) {
IFQ_DEQUEUE(&ifp->if_snd, m);
if (m == NULL)
@ -1123,20 +1130,13 @@ lagg_start(struct ifnet *ifp)
ETHER_BPF_MTAP(ifp, m);
/* We need a Tx algorithm and at least one port */
if (sc->sc_proto != LAGG_PROTO_NONE && sc->sc_count)
error = (*sc->sc_start)(sc, m);
else
m_freem(m);
error = (*sc->sc_start)(sc, m);
if (error == 0)
ifp->if_opackets++;
else
ifp->if_oerrors++;
}
LAGG_RUNLOCK(sc);
return;
}
static struct mbuf *