Module Name: src
Committed By: chs
Date: Tue Nov 17 03:22:33 UTC 2020
Modified Files:
src/sys/kern: sys_socket.c
src/sys/sys: socketvar.h
Log Message:
When SS_RESTARTSYS was added, it was accidentally given the same value as
the existing SS_ASYNC. SS_ASYNC was already vestigial at that point,
having been superceded by SB_ASYNC, however the SS_ASYNC flag is still
set and cleared, unlessly because it is never checked.
Fix this conflict by removing SS_ASYNC and its vestigial uses.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/kern/sys_socket.c
cvs rdiff -u -r1.161 -r1.162 src/sys/sys/socketvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_socket.c
diff -u src/sys/kern/sys_socket.c:1.78 src/sys/kern/sys_socket.c:1.79
--- src/sys/kern/sys_socket.c:1.78 Tue Dec 4 00:18:05 2018
+++ src/sys/kern/sys_socket.c Tue Nov 17 03:22:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_socket.c,v 1.78 2018/12/04 00:18:05 maya Exp $ */
+/* $NetBSD: sys_socket.c,v 1.79 2020/11/17 03:22:33 chs Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.78 2018/12/04 00:18:05 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.79 2020/11/17 03:22:33 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -141,11 +141,9 @@ soo_ioctl(file_t *fp, u_long cmd, void *
case FIOASYNC:
solock(so);
if (*(int *)data) {
- so->so_state |= SS_ASYNC;
so->so_rcv.sb_flags |= SB_ASYNC;
so->so_snd.sb_flags |= SB_ASYNC;
} else {
- so->so_state &= ~SS_ASYNC;
so->so_rcv.sb_flags &= ~SB_ASYNC;
so->so_snd.sb_flags &= ~SB_ASYNC;
}
Index: src/sys/sys/socketvar.h
diff -u src/sys/sys/socketvar.h:1.161 src/sys/sys/socketvar.h:1.162
--- src/sys/sys/socketvar.h:1.161 Mon Oct 5 08:38:17 2020
+++ src/sys/sys/socketvar.h Tue Nov 17 03:22:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: socketvar.h,v 1.161 2020/10/05 08:38:17 roy Exp $ */
+/* $NetBSD: socketvar.h,v 1.162 2020/11/17 03:22:33 chs Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -199,7 +199,6 @@ struct socket {
#define SS_RESTARTSYS 0x100 /* restart blocked system calls */
#define SS_ISDISCONNECTED 0x800 /* socket disconnected from peer */
-#define SS_ASYNC 0x100 /* async i/o notify */
#define SS_MORETOCOME 0x400 /*
* hint from sosend to lower layer;
* more data coming
