Author: np
Date: Tue Jan 17 07:43:37 2017
New Revision: 312337
URL: https://svnweb.freebsd.org/changeset/base/312337
Log:
Fix mismerge in r312117. This is a direct commit to stable/10.
Modified:
stable/10/sys/dev/cxgbe/tom/t4_ddp.c
Modified: stable/10/sys/dev/cxgbe/tom/t4_ddp.c
==============================================================================
--- stable/10/sys/dev/cxgbe/tom/t4_ddp.c Tue Jan 17 07:11:46 2017
(r312336)
+++ stable/10/sys/dev/cxgbe/tom/t4_ddp.c Tue Jan 17 07:43:37 2017
(r312337)
@@ -394,7 +394,6 @@ handle_ddp_data(struct toepcb *toep, __b
/* receive buffer autosize */
MPASS(toep->vnet == so->so_vnet);
CURVNET_SET(toep->vnet);
- SOCKBUF_LOCK(sb);
if (sb->sb_flags & SB_AUTOSIZE &&
V_tcp_do_autorcvbuf &&
sb->sb_hiwat < V_tcp_autorcvbuf_max &&
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
