LU-6245 lnet: remove kernel defines in userland headers

[fs/lustre-release.git] / lnet / include / lnet / socklnd.h

diff --git a/lnet/include/lnet/socklnd.h b/lnet/include/lnet/socklnd.h
index 4510ae7..1271344 100644 (file)
--- a/lnet/include/lnet/socklnd.h
+++ b/lnet/include/lnet/socklnd.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -41,7 +39,6 @@
 #define __LNET_LNET_SOCKLND_H__
 
 #include <lnet/types.h>
-#include <lnet/lib-types.h>
 
 #define SOCKLND_CONN_NONE     (-1)
 #define SOCKLND_CONN_ANY        0
@@ -52,7 +49,6 @@
 
 #define SOCKLND_CONN_ACK        SOCKLND_CONN_BULK_IN
 
-#include <libcfs/libcfs_pack.h>
 typedef struct {
         __u32                   kshm_magic;     /* magic number of socklnd message */
         __u32                   kshm_version;   /* version of socklnd message */
@@ -74,7 +70,7 @@ typedef struct {
          * ksnm_payload is removed because of winnt compiler's limitation:
          * zero-sized array can only be placed at the tail of [nested]
          * structure definitions. lnet payload will be stored just after
-         * the body of structure ksock_lnet_msg_t 
+        * the body of structure ksock_lnet_msg_t
          */
 } WIRE_ATTR ksock_lnet_msg_t;
 
@@ -95,8 +91,6 @@ socklnd_init_msg(ksock_msg_t *msg, int type)
         msg->ksm_zc_cookies[0]  = msg->ksm_zc_cookies[1]  = 0;
 }
 
-#include <libcfs/libcfs_unpack.h>
-
 #define KSOCK_MSG_NOOP          0xc0            /* ksm_u empty */
 #define KSOCK_MSG_LNET          0xc1            /* lnet msg */