X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Finclude%2Flnet%2Flnet.h;h=6b86a22e11a4e532c27e24fcf3564b68d27665d6;hb=e50fc41ad6383e31b896a9306307f10ced1b3de2;hp=577ffabbcac5554de668aba29524f5b8eba469d6;hpb=57e6d88a8a8d858e2d74aeefba4c764ad08cf86d;p=fs%2Flustre-release.git

diff --git a/lnet/include/lnet/lnet.h b/lnet/include/lnet/lnet.h
index 577ffab..6b86a22 100644
--- a/lnet/include/lnet/lnet.h
+++ b/lnet/include/lnet/lnet.h
@@ -1,65 +1,49 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- */
-#ifndef _P30_H_
-#define _P30_H_
-
-#include "build_check.h"
-
 /*
- * p30.h
+ * GPL HEADER START
  *
- * User application interface file
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * 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.
+ *
+ * GPL HEADER END
  */
-
-#if defined (__KERNEL__)
-#include <linux/uio.h>
-#include <linux/types.h>
-#else
-#include <sys/types.h>
-#include <sys/uio.h>
-#endif
-
-#include <portals/types.h>
-#include <portals/nal.h>
-#include <portals/api.h>
-#include <portals/nalids.h>
-
 /*
- * Debugging flags reserved for the Portals reference library.
- * These are not part of the API as described in the SAND report
- * but are for the use of the maintainers of the reference implementation.
- *
- * It is not expected that the real implementations will export
- * this functionality.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  */
-#define PTL_DEBUG_NONE          0ul
-#define PTL_DEBUG_ALL           (0x0FFFul)	/* Only the Portals flags */
 
-#define __bit(x)                ((unsigned long) 1<<(x))
-#define PTL_DEBUG_PUT           __bit(0)
-#define PTL_DEBUG_GET           __bit(1)
-#define PTL_DEBUG_REPLY         __bit(2)
-#define PTL_DEBUG_ACK           __bit(3)
-#define PTL_DEBUG_DROP          __bit(4)
-#define PTL_DEBUG_REQUEST       __bit(5)
-#define PTL_DEBUG_DELIVERY      __bit(6)
-#define PTL_DEBUG_UNLINK        __bit(7)
-#define PTL_DEBUG_THRESHOLD     __bit(8)
-#define PTL_DEBUG_API           __bit(9)
+#ifndef __LNET_H__
+#define __LNET_H__
 
 /*
- * These eight are reserved for the NAL to define
- * It should probably give them better names...
+ * lnet.h
+ *
+ * User application interface file
  */
-#define PTL_DEBUG_NI_ALL        (0xF000ul)	/* Only the NAL flags */
-#define PTL_DEBUG_NI0           __bit(24)
-#define PTL_DEBUG_NI1           __bit(25)
-#define PTL_DEBUG_NI2           __bit(26)
-#define PTL_DEBUG_NI3           __bit(27)
-#define PTL_DEBUG_NI4           __bit(28)
-#define PTL_DEBUG_NI5           __bit(29)
-#define PTL_DEBUG_NI6           __bit(30)
-#define PTL_DEBUG_NI7           __bit(31)
+#include <lnet/linux/lnet.h>
+
+#include <lnet/types.h>
+#include <lnet/api.h>
+#include <lnet/nidstr.h>
 
 #endif