From owner-svn-src-all@FreeBSD.ORG  Mon Apr 14 05:04:23 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CD11E3D8;
 Mon, 14 Apr 2014 05:04:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 B9AC11047;
 Mon, 14 Apr 2014 05:04:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3E54NPH040459;
 Mon, 14 Apr 2014 05:04:23 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3E54Nl9040458;
 Mon, 14 Apr 2014 05:04:23 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201404140504.s3E54Nl9040458@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Mon, 14 Apr 2014 05:04:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r264446 - stable/10/sys/dev/ale
X-SVN-Group: stable-10
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.17
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Apr 2014 05:04:23 -0000

Author: yongari
Date: Mon Apr 14 05:04:23 2014
New Revision: 264446
URL: http://svnweb.freebsd.org/changeset/base/264446

Log:
  MFC r260429:
    m_defrag(9) does not touch original mbuf chain when it can't
    allocate new mbuf.  Free original mbuf chain when driver is not
    able to send the packet.

Modified:
  stable/10/sys/dev/ale/if_ale.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/ale/if_ale.c
==============================================================================
--- stable/10/sys/dev/ale/if_ale.c	Mon Apr 14 04:59:46 2014	(r264445)
+++ stable/10/sys/dev/ale/if_ale.c	Mon Apr 14 05:04:23 2014	(r264446)
@@ -1659,6 +1659,7 @@ ale_encap(struct ale_softc *sc, struct m
 		    (mtod(m, intptr_t) & 3) != 0) {
 			m = m_defrag(*m_head, M_NOWAIT);
 			if (m == NULL) {
+				m_freem(*m_head);
 				*m_head = NULL;
 				return (ENOBUFS);
 			}