LU-6142 socklnd: change UAPI typedefs to proper structure

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

diff --git a/lnet/include/lnet/socklnd.h b/lnet/include/lnet/socklnd.h
index cc455b3..45d8320 100644 (file)
--- a/lnet/include/lnet/socklnd.h
+++ b/lnet/include/lnet/socklnd.h
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -49,7 +45,7 @@
 
 #define SOCKLND_CONN_ACK       SOCKLND_CONN_BULK_IN
 
-typedef struct {
+struct ksock_hello_msg {
        __u32                   kshm_magic;     /* magic number of socklnd message */
        __u32                   kshm_version;   /* version of socklnd message */
        lnet_nid_t              kshm_src_nid;   /* sender's nid */
@@ -61,35 +57,27 @@ typedef struct {
        __u32                   kshm_ctype;     /* connection type */
        __u32                   kshm_nips;      /* # IP addrs */
        __u32                   kshm_ips[0];    /* IP addrs */
-} WIRE_ATTR ksock_hello_msg_t;
+} WIRE_ATTR;
 
-typedef struct {
+struct ksock_lnet_msg {
        lnet_hdr_t              ksnm_hdr;       /* lnet hdr */
 
        /*
         * 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 struct ksock_lnet_msg
         */
-} WIRE_ATTR ksock_lnet_msg_t;
+} WIRE_ATTR;
 
-typedef struct {
+struct ksock_msg {
        __u32                   ksm_type;       /* type of socklnd message */
        __u32                   ksm_csum;       /* checksum if != 0 */
        __u64                   ksm_zc_cookies[2]; /* Zero-Copy request/ACK cookie */
        union {
-               ksock_lnet_msg_t lnetmsg;       /* lnet message, it's empty if it's NOOP */
+               struct ksock_lnet_msg lnetmsg;  /* lnet message, it's empty if it's NOOP */
        } WIRE_ATTR ksm_u;
-} WIRE_ATTR ksock_msg_t;
-
-static inline void
-socklnd_init_msg(ksock_msg_t *msg, int type)
-{
-       msg->ksm_csum           = 0;
-       msg->ksm_type           = type;
-       msg->ksm_zc_cookies[0]  = msg->ksm_zc_cookies[1]  = 0;
-}
+} WIRE_ATTR;
 
 #define KSOCK_MSG_NOOP         0xc0            /* ksm_u empty */
 #define KSOCK_MSG_LNET         0xc1            /* lnet msg */