1 files changed, 0 insertions, 83 deletions
diff --git a/drivers/infiniband/core/ucm.h b/drivers/infiniband/core/ucm.h
deleted file mode 100644
index f46f37bc1201..000000000000
--- a/drivers/infiniband/core/ucm.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2005 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005 Intel Corporation.  All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * $Id: ucm.h 2208 2005-04-22 23:24:31Z libor $
- */
-#ifndef UCM_H
-#define UCM_H
-#include <linux/fs.h>
-#include <linux/device.h>
-#include <linux/cdev.h>
-#include <linux/idr.h>
-#include <rdma/ib_cm.h>
-#include <rdma/ib_user_cm.h>
-struct ib_ucm_file {
-        struct semaphore mutex;
-        struct file *filp;
-        struct list_head  ctxs;   /* list of active connections */
-        struct list_head  events; /* list of pending events */
-        wait_queue_head_t poll_wait;
-};
-struct ib_ucm_context {
-        int                 id;
-        wait_queue_head_t   wait;
-        atomic_t            ref;
-        int                 events_reported;
-        struct ib_ucm_file *file;
-        struct ib_cm_id    *cm_id;
-        __u64              uid;
-        struct list_head    events;    /* list of pending events. */
-        struct list_head    file_list; /* member in file ctx list */
-};
-struct ib_ucm_event {
-        struct ib_ucm_context *ctx;
-        struct list_head file_list; /* member in file event list */
-        struct list_head ctx_list;  /* member in ctx event list */
-        struct ib_cm_id *cm_id;
-        struct ib_ucm_event_resp resp;
-        void *data;
-        void *info;
-        int data_len;
-        int info_len;
-};
-#endif /* UCM_H */

diff --git a/drivers/infiniband/core/ucm.h b/drivers/infiniband/core/ucm.h deleted file mode 100644 index f46f37bc1201..000000000000 --- a/drivers/infiniband/core/ucm.h +++ /dev/null
@@ -1,83 +0,0 @@
1	/*
2	* Copyright (c) 2005 Topspin Communications. All rights reserved.
3	* Copyright (c) 2005 Intel Corporation. All rights reserved.
4	*
5	* This software is available to you under a choice of one of two
6	* licenses. You may choose to be licensed under the terms of the GNU
7	* General Public License (GPL) Version 2, available from the file
8	* COPYING in the main directory of this source tree, or the
9	* OpenIB.org BSD license below:
10	*
11	* Redistribution and use in source and binary forms, with or
12	* without modification, are permitted provided that the following
13	* conditions are met:
14	*
15	* - Redistributions of source code must retain the above
16	* copyright notice, this list of conditions and the following
17	* disclaimer.
18	*
19	* - Redistributions in binary form must reproduce the above
20	* copyright notice, this list of conditions and the following
21	* disclaimer in the documentation and/or other materials
22	* provided with the distribution.
23	*
24	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
27	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
28	* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
29	* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
30	* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
31	* SOFTWARE.
32	*
33	* $Id: ucm.h 2208 2005-04-22 23:24:31Z libor $
34	*/
35
36	#ifndef UCM_H
37	#define UCM_H
38
39	#include <linux/fs.h>
40	#include <linux/device.h>
41	#include <linux/cdev.h>
42	#include <linux/idr.h>
43
44	#include <rdma/ib_cm.h>
45	#include <rdma/ib_user_cm.h>
46
47	struct ib_ucm_file {
48	struct semaphore mutex;
49	struct file *filp;
50
51	struct list_head ctxs; /* list of active connections */
52	struct list_head events; /* list of pending events */
53	wait_queue_head_t poll_wait;
54	};
55
56	struct ib_ucm_context {
57	int id;
58	wait_queue_head_t wait;
59	atomic_t ref;
60	int events_reported;
61
62	struct ib_ucm_file *file;
63	struct ib_cm_id *cm_id;
64	__u64 uid;
65
66	struct list_head events; /* list of pending events. */
67	struct list_head file_list; /* member in file ctx list */
68	};
69
70	struct ib_ucm_event {
71	struct ib_ucm_context *ctx;
72	struct list_head file_list; /* member in file event list */
73	struct list_head ctx_list; /* member in ctx event list */
74
75	struct ib_cm_id *cm_id;
76	struct ib_ucm_event_resp resp;
77	void *data;
78	void *info;
79	int data_len;
80	int info_len;
81	};
82
83	#endif /* UCM_H */