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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to