LU-1346 libcfs: tcpip/time/type related cleanup

[fs/lustre-release.git] / lnet / lnet / api-ni.c

diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index ed5eba9..bfc84d6 100644 (file)
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -506,25 +506,24 @@ lnet_freelist_fini (lnet_freelist_t *fl)
 
 #endif /* LNET_USE_LIB_FREELIST */
 
 
 #endif /* LNET_USE_LIB_FREELIST */
 

-__u64
-lnet_create_interface_cookie (void)
+__u64 lnet_create_interface_cookie (void)

 {
 {

-        /* NB the interface cookie in wire handles guards against delayed
-         * replies and ACKs appearing valid after reboot. Initialisation time,
-         * even if it's only implemented to millisecond resolution is probably
-         * easily good enough. */
-        struct timeval tv;
-        __u64          cookie;
+       /* NB the interface cookie in wire handles guards against delayed
+        * replies and ACKs appearing valid after reboot. Initialisation time,
+        * even if it's only implemented to millisecond resolution is probably
+        * easily good enough. */
+       struct timeval tv;
+       __u64          cookie;

 #ifndef __KERNEL__
 #ifndef __KERNEL__

-        int            rc = gettimeofday (&tv, NULL);
-        LASSERT (rc == 0);
+       int            rc = gettimeofday (&tv, NULL);
+       LASSERT (rc == 0);

 #else
 #else

-        cfs_gettimeofday(&tv);
+       do_gettimeofday(&tv);

 #endif
 #endif

-        cookie = tv.tv_sec;
-        cookie *= 1000000;
-        cookie += tv.tv_usec;
-        return cookie;
+       cookie = tv.tv_sec;
+       cookie *= 1000000;
+       cookie += tv.tv_usec;
+       return cookie;

 }
 
 static char *
 }
 
 static char *