From owner-svn-src-head@FreeBSD.ORG  Mon Jan  9 14:35:06 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 1FE6D1065673;
	Mon,  9 Jan 2012 14:35:06 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 089198FC14;
	Mon,  9 Jan 2012 14:35:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q09EZ5uP044898;
	Mon, 9 Jan 2012 14:35:05 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q09EZ54v044897;
	Mon, 9 Jan 2012 14:35:05 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201201091435.q09EZ54v044897@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 9 Jan 2012 14:35:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229857 - 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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jan 2012 14:35:06 -0000

Author: glebius
Date: Mon Jan  9 14:35:05 2012
New Revision: 229857
URL: http://svn.freebsd.org/changeset/base/229857

Log:
  Can't pass MSIZE to m_cljget(), an mbuf can't be attached as external storage
  to another mbuf.

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	Mon Jan  9 14:23:18 2012	(r229856)
+++ head/sys/contrib/pf/net/if_pfsync.c	Mon Jan  9 14:35:05 2012	(r229857)
@@ -2163,8 +2163,7 @@ pfsync_sendout(void)
 	if (pktlen > MHLEN) {
 		/* Find the right pool to allocate from. */
 		/* XXX: This is ugly. */
-		m_cljget(m, M_DONTWAIT, pktlen <= MSIZE ? MSIZE :
-			pktlen <= MCLBYTES ? MCLBYTES :
+		m_cljget(m, M_DONTWAIT, pktlen <= MCLBYTES ? MCLBYTES :
 #if MJUMPAGESIZE != MCLBYTES
 			pktlen <= MJUMPAGESIZE ? MJUMPAGESIZE :
 #endif