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

[fs/lustre-release.git] / libcfs / include / libcfs / linux / linux-tcpip.h

diff --git a/libcfs/include/libcfs/linux/linux-tcpip.h b/libcfs/include/libcfs/linux/linux-tcpip.h
index b79aac7..2e04b1f 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-tcpip.h
+++ b/libcfs/include/libcfs/linux/linux-tcpip.h
@@ -50,6 +50,7 @@
 #endif
 
 #include <net/sock.h>
+#include <libcfs/linux/portals_compat25.h>
 
 #ifndef HIPQUAD
 // XXX Should just kill all users
@@ -68,7 +69,6 @@
 
 typedef struct socket   cfs_socket_t;
 
-#define SOCK_SNDBUF(so)         ((so)->sk->sk_sndbuf)
 #define SOCK_TEST_NOSPACE(so)   test_bit(SOCK_NOSPACE, &(so)->flags)
 
 static inline int
@@ -82,13 +82,4 @@ libcfs_sock_wmem_queued(struct socket *sock)
 {
         return sock->sk->sk_wmem_queued;
 }
-
-#ifndef HAVE_SK_SLEEP
-static inline wait_queue_head_t *cfs_sk_sleep(struct sock *sk)
-{
-        return sk->sk_sleep;
-}
-#else
-#define cfs_sk_sleep(sk)       sk_sleep(sk)
-#endif
 #endif