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

Allocate our mbuf with m_get2().

Browse Source
This commit is contained in:
Gleb Smirnoff 2012-01-17 12:14:26 +00:00
parent 0adbaa2b80
commit 3a8c7fa008
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2120,9 +2120,6 @@ pfsync_sendout(void)
struct pfsync_upd_req_item *ur;
#ifdef notyet
struct tdb *t;
#endif
#ifdef __FreeBSD__
size_t pktlen;
#endif
int offset;
int q, count = 0;
@ -2145,44 +2142,33 @@ pfsync_sendout(void)
return;
}
#ifdef __FreeBSD__
m = m_get2(M_NOWAIT, MT_DATA, M_PKTHDR, max_linkhdr + sc->sc_len);
if (m == NULL) {
sc->sc_ifp->if_oerrors++;
V_pfsyncstats.pfsyncs_onomem++;
return;
}
#else
MGETHDR(m, M_DONTWAIT, MT_DATA);
if (m == NULL) {
#ifdef __FreeBSD__
sc->sc_ifp->if_oerrors++;
#else
sc->sc_if.if_oerrors++;
#endif
V_pfsyncstats.pfsyncs_onomem++;
pfsyncstats.pfsyncs_onomem++;
pfsync_drop(sc);
return;
}
#ifdef __FreeBSD__
pktlen = max_linkhdr + sc->sc_len;
if (pktlen > MHLEN) {
/* Find the right pool to allocate from. */
/* XXX: This is ugly. */
m_cljget(m, M_DONTWAIT, pktlen <= MCLBYTES ? MCLBYTES :
#if MJUMPAGESIZE != MCLBYTES
pktlen <= MJUMPAGESIZE ? MJUMPAGESIZE :
#endif
pktlen <= MJUM9BYTES ? MJUM9BYTES : MJUM16BYTES);
#else
if (max_linkhdr + sc->sc_len > MHLEN) {
MCLGETI(m, M_DONTWAIT, NULL, max_linkhdr + sc->sc_len);
#endif
if (!ISSET(m->m_flags, M_EXT)) {
m_free(m);
#ifdef __FreeBSD__
sc->sc_ifp->if_oerrors++;
#else
sc->sc_if.if_oerrors++;
#endif
V_pfsyncstats.pfsyncs_onomem++;
pfsyncstats.pfsyncs_onomem++;
pfsync_drop(sc);
return;
}
}
#endif
m->m_data += max_linkhdr;
m->m_len = m->m_pkthdr.len = sc->sc_len;