svn commit: r360489 - stable/12/sys/sys

[Xin LI]

Author: delphij
Date: Thu Apr 30 05:28:48 2020
New Revision: 360489
URL: https://svnweb.freebsd.org/changeset/base/360489

Log:
  Fix build: redo MFC r360059 and revert unwanted portion.

Modified:
  stable/12/sys/sys/socketvar.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/sys/socketvar.h
==============================================================================
--- stable/12/sys/sys/socketvar.h	Thu Apr 30 04:00:53 2020	(r360488)
+++ stable/12/sys/sys/socketvar.h	Thu Apr 30 05:28:48 2020	(r360489)
@@ -173,10 +173,6 @@ struct socket {
 			short		sol_sbsnd_flags;
 			sbintime_t	sol_sbrcv_timeo;
 			sbintime_t	sol_sbsnd_timeo;
-
-			/* Information tracking listen queue overflows. */
-			struct timeval	sol_lastover;	/* (e) */
-			int		sol_overcount;	/* (e) */
 		};
 	};
 };
@@ -185,13 +181,13 @@ struct socket {
 /*
  * Socket state bits.
  *
- * Historically, these bits were all kept in the so_state field.
- * They are now split into separate, lock-specific fields.
- * so_state maintains basic socket state protected by the socket lock.
- * so_qstate holds information about the socket accept queues.
- * Each socket buffer also has a state field holding information
- * relevant to that socket buffer (can't send, rcv).
- * Many fields will be read without locks to improve performance and avoid
+ * Historically, this bits were all kept in the so_state field.  For
+ * locking reasons, they are now in multiple fields, as they are
+ * locked differently.  so_state maintains basic socket state protected
+ * by the socket lock.  so_qstate holds information about the socket
+ * accept queues.  Each socket buffer also has a state field holding
+ * information relevant to that socket buffer (can't send, rcv).  Many
+ * fields will be read without locks to improve performance and avoid
  * lock order issues.  However, this approach must be used with caution.
  */
 #define	SS_NOFDREF		0x0001	/* no file table ref any more */
@@ -384,8 +380,7 @@ struct uio;
 /*
  * From uipc_socket and friends
  */
-int	getsockaddr(struct sockaddr **namp, const struct sockaddr *uaddr,
-	    size_t len);
+int	getsockaddr(struct sockaddr **namp, caddr_t uaddr, size_t len);
 int	getsock_cap(struct thread *td, int fd, cap_rights_t *rightsp,
 	    struct file **fpp, u_int *fflagp, struct filecaps *havecaps);
 void	soabort(struct socket *so);