diff options
| author | dm120769 <none@none> | 2008-04-25 20:19:02 -0700 |
|---|---|---|
| committer | dm120769 <none@none> | 2008-04-25 20:19:02 -0700 |
| commit | c6c65e5445ba6bc005f3da488bddd36494d26e65 (patch) | |
| tree | b769322e7f726d81a4e2a3c7ce53ba85d28c2ecc /usr/src/uts/common/inet/tcp/tcp_fusion.c | |
| parent | 0cfb4e8b28ab16b0cb224619362e8135673714c3 (diff) | |
| download | illumos-gate-c6c65e5445ba6bc005f3da488bddd36494d26e65.tar.gz | |
backout 6567008/6582323/6582330/6582335/6691271: needs more work
--HG--
rename : usr/src/pkgdefs/SUNWdcopy/Makefile => deleted_files/usr/src/pkgdefs/SUNWdcopy/Makefile
rename : usr/src/pkgdefs/SUNWdcopy/pkginfo.tmpl => deleted_files/usr/src/pkgdefs/SUNWdcopy/pkginfo.tmpl
rename : usr/src/pkgdefs/SUNWdcopy/postinstall.tmpl => deleted_files/usr/src/pkgdefs/SUNWdcopy/postinstall.tmpl
rename : usr/src/pkgdefs/SUNWdcopy/preremove.tmpl => deleted_files/usr/src/pkgdefs/SUNWdcopy/preremove.tmpl
rename : usr/src/pkgdefs/SUNWdcopy/prototype_com => deleted_files/usr/src/pkgdefs/SUNWdcopy/prototype_com
rename : usr/src/pkgdefs/SUNWdcopy/prototype_i386 => deleted_files/usr/src/pkgdefs/SUNWdcopy/prototype_i386
rename : usr/src/uts/common/io/dcopy.c => deleted_files/usr/src/uts/common/io/dcopy.c
rename : usr/src/uts/common/sys/dcopy.h => deleted_files/usr/src/uts/common/sys/dcopy.h
rename : usr/src/uts/common/sys/dcopy_device.h => deleted_files/usr/src/uts/common/sys/dcopy_device.h
rename : usr/src/uts/common/sys/sodirect.h => deleted_files/usr/src/uts/common/sys/sodirect.h
rename : usr/src/uts/i86pc/io/ioat/ioat.c => deleted_files/usr/src/uts/i86pc/io/ioat/ioat.c
rename : usr/src/uts/i86pc/io/ioat/ioat.conf => deleted_files/usr/src/uts/i86pc/io/ioat/ioat.conf
rename : usr/src/uts/i86pc/io/ioat/ioat_chan.c => deleted_files/usr/src/uts/i86pc/io/ioat/ioat_chan.c
rename : usr/src/uts/i86pc/io/ioat/ioat_ioctl.c => deleted_files/usr/src/uts/i86pc/io/ioat/ioat_ioctl.c
rename : usr/src/uts/i86pc/io/ioat/ioat_rs.c => deleted_files/usr/src/uts/i86pc/io/ioat/ioat_rs.c
rename : usr/src/uts/i86pc/ioat/Makefile => deleted_files/usr/src/uts/i86pc/ioat/Makefile
rename : usr/src/uts/i86pc/sys/ioat.h => deleted_files/usr/src/uts/i86pc/sys/ioat.h
rename : usr/src/uts/i86xpv/ioat/Makefile => deleted_files/usr/src/uts/i86xpv/ioat/Makefile
rename : usr/src/uts/intel/dcopy/Makefile => deleted_files/usr/src/uts/intel/dcopy/Makefile
Diffstat (limited to 'usr/src/uts/common/inet/tcp/tcp_fusion.c')
| -rw-r--r-- | usr/src/uts/common/inet/tcp/tcp_fusion.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/usr/src/uts/common/inet/tcp/tcp_fusion.c b/usr/src/uts/common/inet/tcp/tcp_fusion.c index 75851ac1f7..2503a13e29 100644 --- a/usr/src/uts/common/inet/tcp/tcp_fusion.c +++ b/usr/src/uts/common/inet/tcp/tcp_fusion.c @@ -287,15 +287,6 @@ tcp_fuse(tcp_t *tcp, uchar_t *iphdr, tcph_t *tcph) if ((mp = allocb(sizeof (*stropt), BPRI_HI)) == NULL) goto failed; - /* If peer sodirect enabled then disable */ - ASSERT(tcp->tcp_sodirect == NULL); - if (peer_tcp->tcp_sodirect != NULL) { - mutex_enter(peer_tcp->tcp_sodirect->sod_lock); - SOD_DISABLE(peer_tcp->tcp_sodirect); - mutex_exit(peer_tcp->tcp_sodirect->sod_lock); - peer_tcp->tcp_sodirect = NULL; - } - /* Fuse both endpoints */ peer_tcp->tcp_loopback_peer = tcp; tcp->tcp_loopback_peer = peer_tcp; |