diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 5d5d1e36f70..1dd503c9bac 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -265,6 +265,11 @@ solisten(so, backlog, td)
 {
 	int s, error;
 
+	/*
+	 * XXXRW: Ordering issue here -- perhaps we need to set
+	 * SO_ACCEPTCONN before the call to pru_listen()?
+	 * XXXRW: General atomic test-and-set concerns here also.
+	 */
 	s = splnet();
 	if (so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING |
 			    SS_ISDISCONNECTING)) {