From owner-svn-src-user@FreeBSD.ORG  Sat May 26 01:55:51 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 D9A34106564A;
	Sat, 26 May 2012 01:55:51 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C513F8FC08;
	Sat, 26 May 2012 01:55:51 +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 q4Q1tpgf045727;
	Sat, 26 May 2012 01:55:51 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4Q1tpiY045725;
	Sat, 26 May 2012 01:55:51 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201205260155.q4Q1tpiY045725@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Sat, 26 May 2012 01:55:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236041 - user/np/toe_iwarp/sys/netinet
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Sat, 26 May 2012 01:55:51 -0000

Author: np
Date: Sat May 26 01:55:51 2012
New Revision: 236041
URL: http://svn.freebsd.org/changeset/base/236041

Log:
  Try not to change the size of the syncache structure.
  
  The knob to control TCP offload used to require explicit opt-out.  It has
  been replaced with one that requires explicit opt-in, and is enabled only
  in x86 GENERIC kernels for now.

Modified:
  user/np/toe_iwarp/sys/netinet/tcp_syncache.h

Modified: user/np/toe_iwarp/sys/netinet/tcp_syncache.h
==============================================================================
--- user/np/toe_iwarp/sys/netinet/tcp_syncache.h	Sat May 26 01:45:53 2012	(r236040)
+++ user/np/toe_iwarp/sys/netinet/tcp_syncache.h	Sat May 26 01:55:51 2012	(r236041)
@@ -68,7 +68,7 @@ struct syncache {
 	u_int8_t	sc_requested_s_scale:4,
 			sc_requested_r_scale:4;
 	u_int16_t	sc_flags;
-#ifdef TCP_OFFLOAD
+#if defined(TCP_OFFLOAD) || !defined(TCP_OFFLOAD_DISABLE)
 	struct toedev	*sc_tod;		/* entry added by this TOE */
 	void		*sc_todctx;		/* TOE driver context */
 #endif