diff options
| author |   Robert Walsh <robert.walsh@qlogic.com> | 2007-03-15 14:45:17 -0700 |
|---|---|---|
| committer |   Roland Dreier <rolandd@cisco.com> | 2007-04-18 20:21:01 -0700 |
| commit | 40b90430ecac40cc9adb26b808cc12a3d569da5d (patch) | |
| tree | 4c87d4b4d3c4f270a0371fdd66b02d78ac8ce306 /drivers/infiniband/hw/ipath/ipath_verbs.h | |
| parent | IB/ipath: Check that a UD work request's address handle is valid (diff) | |
| download | linux-dev-40b90430ecac40cc9adb26b808cc12a3d569da5d.tar.xz linux-dev-40b90430ecac40cc9adb26b808cc12a3d569da5d.zip | |
IB/ipath: Fix WC format drift between user and kernel space
The kernel ib_wc structure now uses a QP pointer, but the user space
equivalent uses a QP number instead. This means we can no longer use
a simple structure copy to copy stuff into user space.
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_verbs.h')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_verbs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.h b/drivers/infiniband/hw/ipath/ipath_verbs.h index 37e742b2a526..7c4929f1cb5b 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs.h +++ b/drivers/infiniband/hw/ipath/ipath_verbs.h @@ -40,6 +40,7 @@ #include <linux/interrupt.h> #include <linux/kref.h> #include <rdma/ib_pack.h> +#include <rdma/ib_user_verbs.h> #include "ipath_layer.h" @@ -188,7 +189,7 @@ struct ipath_mmap_info { struct ipath_cq_wc { u32 head; /* index of next entry to fill */ u32 tail; /* index of next ib_poll_cq() entry */ - struct ib_wc queue[1]; /* this is actually size ibcq.cqe + 1 */ + struct ib_uverbs_wc queue[1]; /* this is actually size ibcq.cqe + 1 */ }; /* |