From: Andrew Deason Date: Fri, 20 Sep 2013 20:13:43 +0000 (-0500) Subject: rx: Always call rxi_StartListener X-Git-Tag: upstream/1.6.6_pre2^2~52 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ccc7a46b419141d7c28e89e2292f4e5d8cdb7683;p=packages%2Fo%2Fopenafs.git rx: Always call rxi_StartListener Commit c10f5296 made rx_Init only call rxi_StartListener in the kernel if we have RXK_LISTENER_ENV. But this doesn't make any sense, since rxi_StartListener only does anything if RXK_LISTENER_ENV is _not_ defined. As a result, for any non-rxk-listener non-rx-upcall platform, we never receives rx packets in the kernel, since we never set up our rx packet callback. The only such platform appears to be AIX, since while other platforms (HPUX, FBSD, IRIX) have a non-rxk-listener mode, they also implement an rxk-listener mode that we always turn on. So, just always call rxi_StartListener, and let the ifdef guards for the various implementations of rxi_StartListener do the right thing. FIXES 131725 Reviewed-on: http://gerrit.openafs.org/10263 Tested-by: BuildBot Reviewed-by: Derrick Brashear (cherry picked from commit 2aa26fcb4e3cf5fa85a3aee3263893a0443a2b75) Change-Id: Id98c29175ec811195183c35c2c43c6c4de817dfc Reviewed-on: http://gerrit.openafs.org/10272 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Jeffrey Altman Reviewed-by: Stephan Wiesand --- diff --git a/src/rx/rx.c b/src/rx/rx.c index dfcd3c5c4..edae3e6b8 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -622,11 +622,9 @@ rx_InitHost(u_int host, u_int port) rx_GetIFInfo(); #endif -#if defined(RXK_LISTENER_ENV) || !defined(KERNEL) /* Start listener process (exact function is dependent on the * implementation environment--kernel or user space) */ rxi_StartListener(); -#endif USERPRI; tmp_status = rxinit_status = 0;