projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[powerpc.git]
/
drivers
/
infiniband
/
core
/
mad_priv.h
diff --git
a/drivers/infiniband/core/mad_priv.h
b/drivers/infiniband/core/mad_priv.h
index
a7125d4
..
b4fa28d
100644
(file)
--- a/
drivers/infiniband/core/mad_priv.h
+++ b/
drivers/infiniband/core/mad_priv.h
@@
-37,6
+37,7
@@
#ifndef __IB_MAD_PRIV_H__
#define __IB_MAD_PRIV_H__
#ifndef __IB_MAD_PRIV_H__
#define __IB_MAD_PRIV_H__
+#include <linux/completion.h>
#include <linux/pci.h>
#include <linux/kthread.h>
#include <linux/workqueue.h>
#include <linux/pci.h>
#include <linux/kthread.h>
#include <linux/workqueue.h>
@@
-108,7
+109,7
@@
struct ib_mad_agent_private {
struct list_head rmpp_list;
atomic_t refcount;
struct list_head rmpp_list;
atomic_t refcount;
-
wait_queue_head_t wait
;
+
struct completion comp
;
};
struct ib_mad_snoop_private {
};
struct ib_mad_snoop_private {
@@
-117,7
+118,7
@@
struct ib_mad_snoop_private {
int snoop_index;
int mad_snoop_flags;
atomic_t refcount;
int snoop_index;
int mad_snoop_flags;
atomic_t refcount;
-
wait_queue_head_t wait
;
+
struct completion comp
;
};
struct ib_mad_send_wr_private {
};
struct ib_mad_send_wr_private {
@@
-216,7
+217,8
@@
extern kmem_cache_t *ib_mad_cache;
int ib_send_mad(struct ib_mad_send_wr_private *mad_send_wr);
struct ib_mad_send_wr_private *
int ib_send_mad(struct ib_mad_send_wr_private *mad_send_wr);
struct ib_mad_send_wr_private *
-ib_find_send_mad(struct ib_mad_agent_private *mad_agent_priv, __be64 tid);
+ib_find_send_mad(struct ib_mad_agent_private *mad_agent_priv,
+ struct ib_mad_recv_wc *mad_recv_wc);
void ib_mad_complete_send_wr(struct ib_mad_send_wr_private *mad_send_wr,
struct ib_mad_send_wc *mad_send_wc);
void ib_mad_complete_send_wr(struct ib_mad_send_wr_private *mad_send_wr,
struct ib_mad_send_wc *mad_send_wc);