From owner-svn-src-head@FreeBSD.ORG Tue Jan 17 16:48:11 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 881AA106566C; Tue, 17 Jan 2012 16:48:11 +0000 (UTC) (envelope-from ermal.luci@gmail.com) Received: from mail-gy0-f182.google.com (mail-gy0-f182.google.com [209.85.160.182]) by mx1.freebsd.org (Postfix) with ESMTP id 09D288FC17; Tue, 17 Jan 2012 16:48:10 +0000 (UTC) Received: by ghy10 with SMTP id 10so255332ghy.13 for ; Tue, 17 Jan 2012 08:48:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=zcBuYfYRcWwmK8wjYCSB4WGDFGUllEDOJQNeqMdfuwU=; b=QzsE6OXuWB+c2n6KTJyJt9ZsAG4XDkbKLG0sSp6Cgb0cSN3gz8v0QRhFLm5QL4XJr/ mGcFExGKOC5CuCbmcsenaCg4i98r3W1I6sBiPA9me36QfPcFytmaBShGKZwKYxmmStDF 09TeqXfsCOEDkrgQait6WyTL/4KrDQgh/JaQA= MIME-Version: 1.0 Received: by 10.50.207.72 with SMTP id lu8mr18290723igc.0.1326818890154; Tue, 17 Jan 2012 08:48:10 -0800 (PST) Sender: ermal.luci@gmail.com Received: by 10.231.134.198 with HTTP; Tue, 17 Jan 2012 08:48:10 -0800 (PST) In-Reply-To: <201201171214.q0HCEQm8089958@svn.freebsd.org> References: <201201171214.q0HCEQm8089958@svn.freebsd.org> Date: Tue, 17 Jan 2012 17:48:10 +0100 X-Google-Sender-Auth: Fn3XyeDI1_vhA9bClVKg7BKvbTM Message-ID: From: =?ISO-8859-1?Q?Ermal_Lu=E7i?= To: Gleb Smirnoff Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r230265 - head/sys/contrib/pf/net X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jan 2012 16:48:11 -0000 Maybe it does not hurt in general to keep the V_ Some work was done to add it, no?! On Tue, Jan 17, 2012 at 1:14 PM, Gleb Smirnoff wrote: > Author: glebius > Date: Tue Jan 17 12:14:26 2012 > New Revision: 230265 > URL: http://svn.freebsd.org/changeset/base/230265 > > Log: > Allocate our mbuf with m_get2(). > > Modified: > head/sys/contrib/pf/net/if_pfsync.c > > Modified: head/sys/contrib/pf/net/if_pfsync.c > > ============================================================================== > --- head/sys/contrib/pf/net/if_pfsync.c Tue Jan 17 12:13:36 2012 > (r230264) > +++ head/sys/contrib/pf/net/if_pfsync.c Tue Jan 17 12:14:26 2012 > (r230265) > @@ -2121,9 +2121,6 @@ pfsync_sendout(void) > #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; > } > > - MGETHDR(m, M_DONTWAIT, MT_DATA); > - if (m == NULL) { > #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) { > 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; > > -- Ermal