X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Flinux%2Flinux-tcpip.h;h=2e04b1fe942a7af4e5d430a9d4b131cc518ba78a;hb=8c47378b057e72d6125f4baffe8721e0734d0d3f;hp=b35877322ea924ca83c1d63927bcece4d0219d42;hpb=c88317218461159cae399f74b459a850ae3c84f8;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/linux/linux-tcpip.h b/libcfs/include/libcfs/linux/linux-tcpip.h
index b358773..2e04b1f 100644
--- 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,21 +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
-
-#ifdef HAVE_INIT_NET
-#define DEFAULT_NET	(&init_net)
-#else
-/* some broken backports */
-#define DEFAULT_NET	(NULL)
-#endif
-
 #endif