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/crypto/external/bsd/openssh/dist/serverloop.c,v
rcsdiff: /ftp/cvs/cvsroot/src/crypto/external/bsd/openssh/dist/serverloop.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1.1.24
retrieving revision 1.1.1.25
diff -u -p -r1.1.1.24 -r1.1.1.25
--- src/crypto/external/bsd/openssh/dist/serverloop.c	2022/02/23 19:04:26	1.1.1.24
+++ src/crypto/external/bsd/openssh/dist/serverloop.c	2022/10/05 22:35:33	1.1.1.25
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.231 2022/01/22 00:49:34 djm Exp $ */
+/* $OpenBSD: serverloop.c,v 1.232 2022/04/20 04:19:11 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -386,8 +386,7 @@ server_loop2(struct ssh *ssh, Authctxt *
 			cleanup_exit(255);
 		}
 
-		if (!ssh_packet_is_rekeying(ssh))
-			channel_after_poll(ssh, pfd, npfd_active);
+		channel_after_poll(ssh, pfd, npfd_active);
 		if (conn_in_ready &&
 		    process_input(ssh, connection_in) < 0)
 			break;