svn commit: r329518 - stable/11/sys/netinet

[Andrey V. Elsukov]

Author: ae
Date: Sun Feb 18 11:36:46 2018
New Revision: 329518
URL: https://svnweb.freebsd.org/changeset/base/329518

Log:
  MFC r329101:
    Reinitialize IP header length after checksum calculation. It is used
    later by TCP-MD5 code.
  
    This fixes the problem with broken TCP-MD5 over IPv4 when NIC has
    disabled TCP checksum offloading.
  
    PR:		223835

Modified:
  stable/11/sys/netinet/tcp_input.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/tcp_input.c
==============================================================================
--- stable/11/sys/netinet/tcp_input.c	Sun Feb 18 11:17:39 2018	(r329517)
+++ stable/11/sys/netinet/tcp_input.c	Sun Feb 18 11:36:46 2018	(r329518)
@@ -706,6 +706,7 @@ tcp_input(struct mbuf **mp, int *offp, int proto)
 			ip->ip_tos = iptos;
 			/* Re-initialization for later version check */
 			ip->ip_v = IPVERSION;
+			ip->ip_hl = off0 >> 2;
 		}
 
 		if (th->th_sum) {