Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.285.2.1
retrieving revision 1.286
diff -u -p -r1.285.2.1 -r1.286
--- src/sys/kern/uipc_socket.c	2020/02/29 20:21:03	1.285.2.1
+++ src/sys/kern/uipc_socket.c	2020/02/18 00:40:50	1.286
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.285.2.1 2020/02/29 20:21:03 ad Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.286 2020/02/18 00:40:50 christos Exp $	*/
 
 /*
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.285.2.1 2020/02/29 20:21:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.286 2020/02/18 00:40:50 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -386,7 +386,7 @@ socket_listener_cb(kauth_cred_t cred, ka
 	enum kauth_network_req req;
 
 	result = KAUTH_RESULT_DEFER;
-	req = (enum kauth_network_req)(uintptr_t)arg0;
+	req = (enum kauth_network_req)arg0;
 
 	if ((action != KAUTH_NETWORK_SOCKET) &&
 	    (action != KAUTH_NETWORK_BIND))
@@ -1992,7 +1992,6 @@ sogetopt1(struct socket *so, struct sock
 		optval = (opt == SO_SNDTIMEO ?
 		     so->so_snd.sb_timeo : so->so_rcv.sb_timeo);
 
-		memset(&tv, 0, sizeof(tv));
 		tv.tv_sec = optval / hz;
 		tv.tv_usec = (optval % hz) * tick;