From owner-svn-src-user@FreeBSD.ORG Tue Apr 17 17:08:51 2012 Return-Path: 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 AA65A106566C; Tue, 17 Apr 2012 17:08: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 7C0308FC19; Tue, 17 Apr 2012 17:08: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 q3HH8pGs091202; Tue, 17 Apr 2012 17:08:51 GMT (envelope-from np@svn.freebsd.org) Received: (from np@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3HH8pB1091197; Tue, 17 Apr 2012 17:08:51 GMT (envelope-from np@svn.freebsd.org) Message-Id: <201204171708.q3HH8pB1091197@svn.freebsd.org> From: Navdeep Parhar Date: Tue, 17 Apr 2012 17:08: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: r234388 - in user/np/toe_iwarp/sys: amd64/conf conf X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Apr 2012 17:08:51 -0000 Author: np Date: Tue Apr 17 17:08:50 2012 New Revision: 234388 URL: http://svn.freebsd.org/changeset/base/234388 Log: Rename TCP_OFFLOAD_DISABLE to TCP_OFFLOAD (with its meaning flipped, of course). Enable it in GENERIC on amd64 only for now. Modified: user/np/toe_iwarp/sys/amd64/conf/GENERIC user/np/toe_iwarp/sys/conf/NOTES user/np/toe_iwarp/sys/conf/files user/np/toe_iwarp/sys/conf/options Modified: user/np/toe_iwarp/sys/amd64/conf/GENERIC ============================================================================== --- user/np/toe_iwarp/sys/amd64/conf/GENERIC Tue Apr 17 16:57:51 2012 (r234387) +++ user/np/toe_iwarp/sys/amd64/conf/GENERIC Tue Apr 17 17:08:50 2012 (r234388) @@ -27,6 +27,7 @@ options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols +options TCP_OFFLOAD # TCP offload options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support Modified: user/np/toe_iwarp/sys/conf/NOTES ============================================================================== --- user/np/toe_iwarp/sys/conf/NOTES Tue Apr 17 16:57:51 2012 (r234387) +++ user/np/toe_iwarp/sys/conf/NOTES Tue Apr 17 17:08:50 2012 (r234388) @@ -544,6 +544,8 @@ options INET6 #IPv6 communications pr options ROUTETABLES=2 # max 16. 1 is back compatible. +options TCP_OFFLOAD # TCP offload support. + # In order to enable IPSEC you MUST also add device crypto to # your kernel configuration options IPSEC #IP security (requires device crypto) Modified: user/np/toe_iwarp/sys/conf/files ============================================================================== --- user/np/toe_iwarp/sys/conf/files Tue Apr 17 16:57:51 2012 (r234387) +++ user/np/toe_iwarp/sys/conf/files Tue Apr 17 17:08:50 2012 (r234388) @@ -2993,7 +2993,7 @@ netinet/tcp_hostcache.c optional inet | netinet/tcp_input.c optional inet | inet6 netinet/tcp_lro.c optional inet | inet6 netinet/tcp_output.c optional inet | inet6 -netinet/tcp_offload.c optional inet | inet6 +netinet/tcp_offload.c optional tcp_offload inet | tcp_offload inet6 netinet/tcp_reass.c optional inet | inet6 netinet/tcp_sack.c optional inet | inet6 netinet/tcp_subr.c optional inet | inet6 Modified: user/np/toe_iwarp/sys/conf/options ============================================================================== --- user/np/toe_iwarp/sys/conf/options Tue Apr 17 16:57:51 2012 (r234387) +++ user/np/toe_iwarp/sys/conf/options Tue Apr 17 17:08:50 2012 (r234388) @@ -432,7 +432,7 @@ RADIX_MPATH opt_mpath.h ROUTETABLES opt_route.h SLIP_IFF_OPTS opt_slip.h TCPDEBUG -TCP_OFFLOAD_DISABLE opt_inet.h #Disable code to dispatch tcp offloading +TCP_OFFLOAD opt_inet.h # Enable code to dispatch TCP offloading TCP_SIGNATURE opt_inet.h VLAN_ARRAY opt_vlan.h XBONEHACK