LU-14660 lnet: Fix destination NID for discovery PUSH

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

diff --git a/lnet/include/lnet/socklnd.h b/lnet/include/lnet/socklnd.h
index 45d8320..fed0d6e 100644 (file)
--- a/lnet/include/lnet/socklnd.h
+++ b/lnet/include/lnet/socklnd.h
@@ -25,25 +25,14 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lnet/include/lnet/socklnd.h
- *
- * #defines shared between socknal implementation and utilities
  */
 #ifndef __LNET_LNET_SOCKLND_H__
 #define __LNET_LNET_SOCKLND_H__
 
-#include <lnet/types.h>
-
-#define SOCKLND_CONN_NONE     (-1)
-#define SOCKLND_CONN_ANY       0
-#define SOCKLND_CONN_CONTROL   1
-#define SOCKLND_CONN_BULK_IN   2
-#define SOCKLND_CONN_BULK_OUT  3
-#define SOCKLND_CONN_NTYPES    4
-
-#define SOCKLND_CONN_ACK       SOCKLND_CONN_BULK_IN
+#include <uapi/linux/lnet/lnet-types.h>
+#include <uapi/linux/lnet/socklnd.h>
 
 struct ksock_hello_msg {
        __u32                   kshm_magic;     /* magic number of socklnd message */
@@ -57,10 +46,10 @@ struct ksock_hello_msg {
        __u32                   kshm_ctype;     /* connection type */
        __u32                   kshm_nips;      /* # IP addrs */
        __u32                   kshm_ips[0];    /* IP addrs */
-} WIRE_ATTR;
+} __packed;
 
 struct ksock_lnet_msg {
-       lnet_hdr_t              ksnm_hdr;       /* lnet hdr */
+       struct lnet_hdr         ksnm_hdr;       /* lnet hdr */
 
        /*
         * ksnm_payload is removed because of winnt compiler's limitation:
@@ -68,7 +57,7 @@ struct ksock_lnet_msg {
         * structure definitions. lnet payload will be stored just after
         * the body of structure struct ksock_lnet_msg
         */
-} WIRE_ATTR;
+} __packed;
 
 struct ksock_msg {
        __u32                   ksm_type;       /* type of socklnd message */
@@ -76,8 +65,8 @@ struct ksock_msg {
        __u64                   ksm_zc_cookies[2]; /* Zero-Copy request/ACK cookie */
        union {
                struct ksock_lnet_msg lnetmsg;  /* lnet message, it's empty if it's NOOP */
-       } WIRE_ATTR ksm_u;
-} WIRE_ATTR;
+       } __packed ksm_u;
+} __packed;
 
 #define KSOCK_MSG_NOOP         0xc0            /* ksm_u empty */
 #define KSOCK_MSG_LNET         0xc1            /* lnet msg */