From owner-svn-src-user@FreeBSD.ORG Fri Nov 16 00:23:23 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id CD5165CB;
Fri, 16 Nov 2012 00:23:23 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id B349E8FC12;
Fri, 16 Nov 2012 00:23:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAG0NNR1083731;
Fri, 16 Nov 2012 00:23:23 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAG0NN5H083729;
Fri, 16 Nov 2012 00:23:23 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201211160023.qAG0NN5H083729@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Fri, 16 Nov 2012 00:23:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r243111 - user/np/stable_9_toe/sys/dev/cxgbe/tom
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Nov 2012 00:23:23 -0000
Author: np
Date: Fri Nov 16 00:23:23 2012
New Revision: 243111
URL: http://svnweb.freebsd.org/changeset/base/243111
Log:
Pull in mbuf leak fix from head (r243110).
Modified:
user/np/stable_9_toe/sys/dev/cxgbe/tom/t4_listen.c
Directory Properties:
user/np/stable_9_toe/sys/ (props changed)
user/np/stable_9_toe/sys/dev/ (props changed)
Modified: user/np/stable_9_toe/sys/dev/cxgbe/tom/t4_listen.c
==============================================================================
--- user/np/stable_9_toe/sys/dev/cxgbe/tom/t4_listen.c Fri Nov 16 00:21:54 2012 (r243110)
+++ user/np/stable_9_toe/sys/dev/cxgbe/tom/t4_listen.c Fri Nov 16 00:23:23 2012 (r243111)
@@ -559,8 +559,10 @@ t4_syncache_respond(struct toedev *tod,
struct tcphdr *th = (void *)(ip + 1);
wr = (struct wrqe *)atomic_readandclear_ptr(&synqe->wr);
- if (wr == NULL)
+ if (wr == NULL) {
+ m_freem(m);
return (EALREADY);
+ }
bzero(&to, sizeof(to));
tcp_dooptions(&to, (void *)(th + 1), (th->th_off << 2) - sizeof(*th),