diff options
| author | Roland Dreier <roland@purestorage.com> | 2014-01-23 02:24:21 -0500 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2014-01-23 02:24:21 -0500 |
| commit | fb1b5034e4987b158179a62732fb6dfb8f7ec88e (patch) | |
| tree | 93d02ff7f0f530286fd54d03b632c6eaabc9dcc9 /drivers/infiniband/hw/ocrdma/ocrdma_hw.h | |
| parent | 8f399921ea9a562bc8221258c4b8a7bd69577939 (diff) | |
| parent | 27cdef637c25705b433d5c4deeef4cf8dcb75d6a (diff) | |
Merge branch 'ip-roce' into for-next
Conflicts:
drivers/infiniband/hw/mlx4/main.c
Diffstat (limited to 'drivers/infiniband/hw/ocrdma/ocrdma_hw.h')
| -rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma_hw.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h index f2a89d4cc7c4..82fe332ae6c6 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h | |||
| @@ -94,7 +94,6 @@ void ocrdma_ring_cq_db(struct ocrdma_dev *, u16 cq_id, bool armed, | |||
| 94 | int ocrdma_mbx_get_link_speed(struct ocrdma_dev *dev, u8 *lnk_speed); | 94 | int ocrdma_mbx_get_link_speed(struct ocrdma_dev *dev, u8 *lnk_speed); |
| 95 | int ocrdma_query_config(struct ocrdma_dev *, | 95 | int ocrdma_query_config(struct ocrdma_dev *, |
| 96 | struct ocrdma_mbx_query_config *config); | 96 | struct ocrdma_mbx_query_config *config); |
| 97 | int ocrdma_resolve_dgid(struct ocrdma_dev *, union ib_gid *dgid, u8 *mac_addr); | ||
| 98 | 97 | ||
| 99 | int ocrdma_mbx_alloc_pd(struct ocrdma_dev *, struct ocrdma_pd *); | 98 | int ocrdma_mbx_alloc_pd(struct ocrdma_dev *, struct ocrdma_pd *); |
| 100 | int ocrdma_mbx_dealloc_pd(struct ocrdma_dev *, struct ocrdma_pd *); | 99 | int ocrdma_mbx_dealloc_pd(struct ocrdma_dev *, struct ocrdma_pd *); |