LU-7734 lnet: fix routing selection

[fs/lustre-release.git] / lnet / utils / wirecheck.c

diff --git a/lnet/utils/wirecheck.c b/lnet/utils/wirecheck.c
index 844a8e5..2d5d1b2 100644 (file)
--- a/lnet/utils/wirecheck.c
+++ b/lnet/utils/wirecheck.c
@@ -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.
@@ -17,17 +15,15 @@
  *
  * 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
  */
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -38,12 +34,14 @@
 #define _GNU_SOURCE
 #endif
 
+#include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <lnet/lib-lnet.h>
-
-#include <string.h>
+#include <lnet/types.h>
 
 #ifndef HAVE_STRNLEN
 #define strnlen(s, i) strlen(s)
@@ -95,11 +93,11 @@ do {                                            \
 } while (0)
 
 void
-check_lnet_handle_wire (void)
+check_lnet_handle_wire(void)
 {
-        CHECK_STRUCT (lnet_handle_wire_t);
-        CHECK_MEMBER (lnet_handle_wire_t, wh_interface_cookie);
-        CHECK_MEMBER (lnet_handle_wire_t, wh_object_cookie);
+       CHECK_STRUCT(struct lnet_handle_wire);
+       CHECK_MEMBER(struct lnet_handle_wire, wh_interface_cookie);
+       CHECK_MEMBER(struct lnet_handle_wire, wh_object_cookie);
 }
 
 void