diff options
author | Sean Hefty <sean.hefty@intel.com> | 2008-07-15 02:48:43 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2008-07-15 02:48:43 -0400 |
commit | a9474917099e007c0f51d5474394b5890111614f (patch) | |
tree | d33da1632f3a03871f45a382124158a046f54b88 /include/rdma/rdma_cm_ib.h | |
parent | 929555a2baed9b0b050d03532655bfd721a43c44 (diff) |
RDMA: Fix license text
The license text for several files references a third software license
that was inadvertently copied in. Update the license to what was
intended. This update was based on a request from HP.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'include/rdma/rdma_cm_ib.h')
-rw-r--r-- | include/rdma/rdma_cm_ib.h | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/include/rdma/rdma_cm_ib.h b/include/rdma/rdma_cm_ib.h index 950424b38f16..2389c3b45404 100644 --- a/include/rdma/rdma_cm_ib.h +++ b/include/rdma/rdma_cm_ib.h | |||
@@ -1,29 +1,33 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2006 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 Intel Corporation. All rights reserved. |
3 | * | 3 | * |
4 | * This Software is licensed under one of the following licenses: | 4 | * This software is available to you under a choice of one of two |
5 | * | 5 | * licenses. You may choose to be licensed under the terms of the GNU |
6 | * 1) under the terms of the "Common Public License 1.0" a copy of which is | 6 | * General Public License (GPL) Version 2, available from the file |
7 | * available from the Open Source Initiative, see | 7 | * COPYING in the main directory of this source tree, or the |
8 | * http://www.opensource.org/licenses/cpl.php. | 8 | * OpenIB.org BSD license below: |
9 | * | 9 | * |
10 | * 2) under the terms of the "The BSD License" a copy of which is | 10 | * Redistribution and use in source and binary forms, with or |
11 | * available from the Open Source Initiative, see | 11 | * without modification, are permitted provided that the following |
12 | * http://www.opensource.org/licenses/bsd-license.php. | 12 | * conditions are met: |
13 | * | 13 | * |
14 | * 3) under the terms of the "GNU General Public License (GPL) Version 2" a | 14 | * - Redistributions of source code must retain the above |
15 | * copy of which is available from the Open Source Initiative, see | 15 | * copyright notice, this list of conditions and the following |
16 | * http://www.opensource.org/licenses/gpl-license.php. | 16 | * disclaimer. |
17 | * | 17 | * |
18 | * Licensee has the right to choose one of the above licenses. | 18 | * - Redistributions in binary form must reproduce the above |
19 | * | 19 | * copyright notice, this list of conditions and the following |
20 | * Redistributions of source code must retain the above copyright | 20 | * disclaimer in the documentation and/or other materials |
21 | * notice and one of the license notices. | 21 | * provided with the distribution. |
22 | * | 22 | * |
23 | * Redistributions in binary form must reproduce both the above copyright | 23 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
24 | * notice, one of the license notices in the documentation | 24 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
25 | * and/or other materials provided with the distribution. | 25 | * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
26 | * | 26 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS |
27 | * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
28 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
29 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
30 | * SOFTWARE. | ||
27 | */ | 31 | */ |
28 | 32 | ||
29 | #if !defined(RDMA_CM_IB_H) | 33 | #if !defined(RDMA_CM_IB_H) |