diff options
| author | Jens Axboe | 2016-09-13 15:58:34 +0200 |
|---|---|---|
| committer | Jens Axboe | 2016-09-13 15:58:34 +0200 |
| commit | 3bc42f3f0ef13a8239138a4c00a0b782f029f23d (patch) | |
| tree | d098779bb062ee740158ed4b41065172ef4aa81b /drivers/infiniband/hw/cxgb4/iw_cxgb4.h | |
| parent | nvme/quirk: Add a delay before checking device ready for memblaze device (diff) | |
| parent | nvme-rdma: add back dependency on CONFIG_BLOCK (diff) | |
| download | kernel-qcow2-linux-3bc42f3f0ef13a8239138a4c00a0b782f029f23d.tar.gz kernel-qcow2-linux-3bc42f3f0ef13a8239138a4c00a0b782f029f23d.tar.xz kernel-qcow2-linux-3bc42f3f0ef13a8239138a4c00a0b782f029f23d.zip | |
Merge branch 'nvmf-4.8-rc' of git://git.infradead.org/nvme-fabrics into for-linus
Sagi writes:
Here we have:
- Kconfig dependencies fix from Arnd
- nvme-rdma device removal fixes from Steve
- possible bad deref fix from Colin
Diffstat (limited to 'drivers/infiniband/hw/cxgb4/iw_cxgb4.h')
| -rw-r--r-- | drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h index aa47e0ae80bc..4b83b84f7ddf 100644 --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h @@ -263,6 +263,7 @@ struct c4iw_dev { struct idr stid_idr; struct list_head db_fc_list; u32 avail_ird; + wait_queue_head_t wait; }; static inline struct c4iw_dev *to_c4iw_dev(struct ib_device *ibdev) |