svn commit: r311974 - head/sys/netinet

[Maxim Sobolev]

Author: sobomax
Date: Thu Jan 12 10:14:54 2017
New Revision: 311974
URL: https://svnweb.freebsd.org/changeset/base/311974

Log:
  Fix slight type mismatch between so_options defined in sys/socketvar.h
  and tw_so_options defined here which is supposed to be a copy of the
  former (short vs u_short respectively).
  
  Switch tw_so_options to be "signed short" to match the type of the field
  it's inherited from.

Modified:
  head/sys/netinet/tcp_var.h

Modified: head/sys/netinet/tcp_var.h
==============================================================================
--- head/sys/netinet/tcp_var.h	Thu Jan 12 09:38:14 2017	(r311973)
+++ head/sys/netinet/tcp_var.h	Thu Jan 12 10:14:54 2017	(r311974)
@@ -452,7 +452,7 @@ struct tcptw {
 	tcp_seq		iss;
 	tcp_seq		irs;
 	u_short		last_win;	/* cached window value */
-	u_short		tw_so_options;	/* copy of so_options */
+	short		tw_so_options;	/* copy of so_options */
 	struct ucred	*tw_cred;	/* user credentials */
 	u_int32_t	t_recent;
 	u_int32_t	ts_offset;	/* our timestamp offset */