From owner-svn-src-all@freebsd.org  Sun Sep 11 07:24:14 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 309B4BD6714;
 Sun, 11 Sep 2016 07:24:14 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E164990;
 Sun, 11 Sep 2016 07:24:13 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8B7ODIj057899;
 Sun, 11 Sep 2016 07:24:13 GMT (envelope-from kevlo@FreeBSD.org)
Received: (from kevlo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8B7ODI1057898;
 Sun, 11 Sep 2016 07:24:13 GMT (envelope-from kevlo@FreeBSD.org)
Message-Id: <201609110724.u8B7ODI1057898@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevlo set sender to
 kevlo@FreeBSD.org using -f
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Sun, 11 Sep 2016 07:24:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r305691 - stable/11/sys/kern
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Sep 2016 07:24:14 -0000

Author: kevlo
Date: Sun Sep 11 07:24:12 2016
New Revision: 305691
URL: https://svnweb.freebsd.org/changeset/base/305691

Log:
  MFC r305575:
  
  In m_devget(), if the data fits in a packet header mbuf, check the amount
  of data is less than or equal to MHLEN instead of MLEN when placing initial
  small packet header at end of mbuf.
  
  Reviewed by:	glebius

Modified:
  stable/11/sys/kern/uipc_mbuf.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/uipc_mbuf.c
==============================================================================
--- stable/11/sys/kern/uipc_mbuf.c	Sun Sep 11 01:11:47 2016	(r305690)
+++ stable/11/sys/kern/uipc_mbuf.c	Sun Sep 11 07:24:12 2016	(r305691)
@@ -984,7 +984,7 @@ m_devget(char *buf, int totlen, int off,
 				len = MHLEN;
 
 				/* Place initial small packet/header at end of mbuf */
-				if (m && totlen + off + max_linkhdr <= MLEN) {
+				if (m && totlen + off + max_linkhdr <= MHLEN) {
 					m->m_data += max_linkhdr;
 					len -= max_linkhdr;
 				}