From owner-svn-src-all@FreeBSD.ORG Tue Jan 17 22:38:13 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CCA701065670; Tue, 17 Jan 2012 22:38:13 +0000 (UTC) (envelope-from ermal.luci@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id 4AE108FC15; Tue, 17 Jan 2012 22:38:13 +0000 (UTC) Received: by ggki1 with SMTP id i1so4476586ggk.13 for ; Tue, 17 Jan 2012 14:38:12 -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=ZYchtQIOOoPx3H/VWxpZU+6YZRlcYxMMzcBoLxCAt4g=; b=wdDVX/myaukhXmWeW9KW9QaFxwt62NBDmIydK6WBeLWiEc1T333JWehP5AAvqss0M1 V4Bo1WonFIRpRnE29nly2SuMURSINmjM+q/hsJp7GugQ24Dp+C0JbRHwA/RKk3DLxCep sdiwnwniYfXDxp7h2PPjFSbHVe8xB8DWgdbPk= MIME-Version: 1.0 Received: by 10.50.207.72 with SMTP id lu8mr19697092igc.0.1326839892107; Tue, 17 Jan 2012 14:38:12 -0800 (PST) Sender: ermal.luci@gmail.com Received: by 10.231.134.198 with HTTP; Tue, 17 Jan 2012 14:38:12 -0800 (PST) In-Reply-To: <20120117175323.GH12760@FreeBSD.org> References: <201201171214.q0HCEQm8089958@svn.freebsd.org> <20120117175323.GH12760@FreeBSD.org> Date: Tue, 17 Jan 2012 23:38:12 +0100 X-Google-Sender-Auth: dEVCqjmQ0GzjfONCYCNd5E5ZoXM 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-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jan 2012 22:38:14 -0000 2012/1/17 Gleb Smirnoff > On Tue, Jan 17, 2012 at 05:48:10PM +0100, Ermal Lu?i wrote: > E> Maybe it does not hurt in general to keep the V_ > E> Some work was done to add it, no?! > > The V_ has been left under __FreeBSD__. > > E> On Tue, Jan 17, 2012 at 1:14 PM, Gleb Smirnoff > wrote: > E> > E> > Author: glebius > E> > Date: Tue Jan 17 12:14:26 2012 > E> > New Revision: 230265 > E> > URL: http://svn.freebsd.org/changeset/base/230265 > E> > > E> > Log: > E> > Allocate our mbuf with m_get2(). > E> > > E> > Modified: > E> > head/sys/contrib/pf/net/if_pfsync.c > E> > > E> > Modified: head/sys/contrib/pf/net/if_pfsync.c > E> > > E> > > ============================================================================== > E> > --- head/sys/contrib/pf/net/if_pfsync.c Tue Jan 17 12:13:36 2012 > E> > (r230264) > E> > +++ head/sys/contrib/pf/net/if_pfsync.c Tue Jan 17 12:14:26 2012 > E> > (r230265) > E> > @@ -2121,9 +2121,6 @@ pfsync_sendout(void) > E> > #ifdef notyet > E> > struct tdb *t; > E> > #endif > E> > -#ifdef __FreeBSD__ > E> > - size_t pktlen; > E> > -#endif > E> > int offset; > E> > int q, count = 0; > E> > > E> > @@ -2145,44 +2142,33 @@ pfsync_sendout(void) > E> > return; > E> > } > E> > > E> > - MGETHDR(m, M_DONTWAIT, MT_DATA); > E> > - if (m == NULL) { > E> > #ifdef __FreeBSD__ > E> > + m = m_get2(M_NOWAIT, MT_DATA, M_PKTHDR, max_linkhdr + > sc->sc_len); > E> > + if (m == NULL) { > E> > sc->sc_ifp->if_oerrors++; > E> > + V_pfsyncstats.pfsyncs_onomem++; > E> > + return; > E> > + } > E> > #else > E> > + MGETHDR(m, M_DONTWAIT, MT_DATA); > E> > + if (m == NULL) { > E> > sc->sc_if.if_oerrors++; > E> > -#endif > E> > - V_pfsyncstats.pfsyncs_onomem++; > E> > + pfsyncstats.pfsyncs_onomem++; > ^^^^^^^^^^^^^^^^^^ What about this? > E> > pfsync_drop(sc); > E> > return; > E> > } > E> > > E> > -#ifdef __FreeBSD__ > E> > - pktlen = max_linkhdr + sc->sc_len; > E> > - if (pktlen > MHLEN) { > E> > - /* Find the right pool to allocate from. */ > E> > - /* XXX: This is ugly. */ > E> > - m_cljget(m, M_DONTWAIT, pktlen <= MCLBYTES ? MCLBYTES > : > E> > -#if MJUMPAGESIZE != MCLBYTES > E> > - pktlen <= MJUMPAGESIZE ? MJUMPAGESIZE : > E> > -#endif > E> > - pktlen <= MJUM9BYTES ? MJUM9BYTES : > MJUM16BYTES); > E> > -#else > E> > if (max_linkhdr + sc->sc_len > MHLEN) { > E> > MCLGETI(m, M_DONTWAIT, NULL, max_linkhdr + sc->sc_len); > E> > -#endif > E> > if (!ISSET(m->m_flags, M_EXT)) { > E> > m_free(m); > E> > -#ifdef __FreeBSD__ > E> > - sc->sc_ifp->if_oerrors++; > E> > -#else > E> > sc->sc_if.if_oerrors++; > E> > -#endif > E> > - V_pfsyncstats.pfsyncs_onomem++; > E> > + pfsyncstats.pfsyncs_onomem++; > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ What about this? > E> > pfsync_drop(sc); > E> > return; > E> > } > E> > } > E> > +#endif > E> > m->m_data += max_linkhdr; > E> > m->m_len = m->m_pkthdr.len = sc->sc_len; > E> > > E> > > E> > E> > E> -- > E> Ermal > > -- > Totus tuus, Glebius. > -- Ermal