From 564c5f2fb6b43c3b6b6ed04802123f20fea390f4 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Sat, 20 Jan 2001 00:38:26 +0000 Subject: [PATCH] This commit was generated by cvs2svn to compensate for changes in r153, which included commits to RCS files with non-trunk default branches. --- src/config/Makefile.version-NOCML | 2 +- src/rx/LINUX/rx_knet.c | 4 ++++ src/rx/rx_kcommon.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/config/Makefile.version-NOCML b/src/config/Makefile.version-NOCML index 9edc0ddf0..d310e0ecd 100644 --- a/src/config/Makefile.version-NOCML +++ b/src/config/Makefile.version-NOCML @@ -8,7 +8,7 @@ AFS_component_version_number.o: AFS_component_version_number.c AFS_component_version_number.c: - echo 'char cml_version_number[]="@(#) OpenAFS devel built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c; + echo 'char cml_version_number[]="@(#) OpenAFS stable 1.0.2 built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c; echo 'char* AFSVersion = "openafs devel"; ' >>AFS_component_version_number.c; noversion: install diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c index 37a39f41f..e7307e2be 100644 --- a/src/rx/LINUX/rx_knet.c +++ b/src/rx/LINUX/rx_knet.c @@ -176,7 +176,11 @@ void osi_StopListener(void) if (rxk_ListenerPid) { (void) (*sys_killp)(rxk_ListenerPid, 9); +#ifdef AFS_LINUX24_ENV + afs_osi_Sleep(&rxk_ListenerPid); +#else rxk_ListenerPid = 0; +#endif } sock_release(rx_socket); rx_socket = NULL; diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index f377feec6..005664ddc 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -969,6 +969,9 @@ void rxk_Listener(void) afs_osi_Wakeup(&afs_termState); } rxk_ListenerPid = 0; +#ifdef AFS_LINUX24_ENV + afs_osi_Wakeup(&rxk_ListenerPid); +#endif #ifdef AFS_SUN5_ENV AFS_GUNLOCK(); #endif /* AFS_SUN5_ENV */ -- 2.39.5