From owner-svn-src-all@FreeBSD.ORG  Sat Jan 26 01:41:42 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id CEB1665A;
 Sat, 26 Jan 2013 01:41:42 +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 C04167A9;
 Sat, 26 Jan 2013 01:41:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0Q1fgvM002772;
 Sat, 26 Jan 2013 01:41:42 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0Q1fg1U002771;
 Sat, 26 Jan 2013 01:41:42 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201301260141.r0Q1fg1U002771@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Sat, 26 Jan 2013 01:41:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245934 - head/sys/netinet
X-SVN-Group: head
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.14
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: Sat, 26 Jan 2013 01:41:42 -0000

Author: np
Date: Sat Jan 26 01:41:42 2013
New Revision: 245934
URL: http://svnweb.freebsd.org/changeset/base/245934

Log:
  Add checks for SO_NO_OFFLOAD in a couple of places that I missed earlier
  in r245915.

Modified:
  head/sys/netinet/tcp_usrreq.c

Modified: head/sys/netinet/tcp_usrreq.c
==============================================================================
--- head/sys/netinet/tcp_usrreq.c	Sat Jan 26 01:06:27 2013	(r245933)
+++ head/sys/netinet/tcp_usrreq.c	Sat Jan 26 01:41:42 2013	(r245934)
@@ -537,6 +537,7 @@ tcp6_usr_connect(struct socket *so, stru
 			goto out;
 #ifdef TCP_OFFLOAD
 		if (registered_toedevs > 0 &&
+		    (so->so_options & SO_NO_OFFLOAD) == 0 &&
 		    (error = tcp_offload_connect(so, nam)) == 0)
 			goto out;
 #endif
@@ -553,6 +554,7 @@ tcp6_usr_connect(struct socket *so, stru
 		goto out;
 #ifdef TCP_OFFLOAD
 	if (registered_toedevs > 0 &&
+	    (so->so_options & SO_NO_OFFLOAD) == 0 &&
 	    (error = tcp_offload_connect(so, nam)) == 0)
 		goto out;
 #endif