diff options
| author | np <np@FreeBSD.org> | 2017-01-17 07:43:37 +0000 |
|---|---|---|
| committer | np <np@FreeBSD.org> | 2017-01-17 07:43:37 +0000 |
| commit | 2bc57941d848317737cf6d7124f9aa32147e27f5 (patch) | |
| tree | 23d33c01ead9f0361912741d6fc550309ec48972 | |
| parent | 7200face1fee777983413142baf809f1584e6c37 (diff) | |
| download | FreeBSD-src-2bc57941d848317737cf6d7124f9aa32147e27f5.zip FreeBSD-src-2bc57941d848317737cf6d7124f9aa32147e27f5.tar.gz | |
Fix mismerge in r312117. This is a direct commit to stable/10.
| -rw-r--r-- | sys/dev/cxgbe/tom/t4_ddp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c index 630515f..8dad045 100644 --- a/sys/dev/cxgbe/tom/t4_ddp.c +++ b/sys/dev/cxgbe/tom/t4_ddp.c @@ -394,7 +394,6 @@ handle_ddp_data(struct toepcb *toep, __be32 ddp_report, __be32 rcv_nxt, int len) /* 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 && |
