equal
deleted
inserted
replaced
|
1 # |
|
2 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
|
3 # |
1 diff -r -u /tmp/839450/libmlx4-1.0.1/Makefile.am libmlx4-1.0.1/Makefile.am |
4 diff -r -u /tmp/839450/libmlx4-1.0.1/Makefile.am libmlx4-1.0.1/Makefile.am |
2 --- /tmp/839450/libmlx4-1.0.1/Makefile.am Tue Sep 8 06:40:35 2009 |
5 --- /tmp/839450/libmlx4-1.0.1/Makefile.am Tue Sep 8 06:40:35 2009 |
3 +++ libmlx4-1.0.1/Makefile.am Tue Mar 15 06:49:47 2011 |
6 +++ libmlx4-1.0.1/Makefile.am Tue Mar 15 06:49:47 2011 |
4 @@ -10,7 +10,7 @@ |
7 @@ -10,7 +10,7 @@ |
5 src_libmlx4_la_SOURCES = $(MLX4_SOURCES) |
8 src_libmlx4_la_SOURCES = $(MLX4_SOURCES) |
821 |
824 |
822 struct ibv_xrc_domain *mlx4_open_xrc_domain(struct ibv_context *context, |
825 struct ibv_xrc_domain *mlx4_open_xrc_domain(struct ibv_context *context, |
823 diff -r -u /tmp/839450/libmlx4-1.0.1/src/qp.c libmlx4-1.0.1/src/qp.c |
826 diff -r -u /tmp/839450/libmlx4-1.0.1/src/qp.c libmlx4-1.0.1/src/qp.c |
824 --- /tmp/839450/libmlx4-1.0.1/src/qp.c Thu Mar 10 04:48:34 2011 |
827 --- /tmp/839450/libmlx4-1.0.1/src/qp.c Thu Mar 10 04:48:34 2011 |
825 +++ libmlx4-1.0.1/src/qp.c Tue Mar 15 07:09:43 2011 |
828 +++ libmlx4-1.0.1/src/qp.c Tue Mar 15 07:09:43 2011 |
826 @@ -589,6 +589,58 @@ |
829 @@ -407,7 +407,8 @@ |
|
830 out: |
|
831 ctx = to_mctx(ibqp->context); |
|
832 |
|
833 - if (nreq == 1 && inl && size > 1 && size < ctx->bf_buf_size / 16) { |
|
834 + if (ctx->ibv_ctx.device->blueflame_enabled && nreq == 1 && inl && |
|
835 + size > 1 && size < ctx->bf_buf_size / 16) { |
|
836 ctrl->owner_opcode |= htonl((qp->sq.head & 0xffff) << 8); |
|
837 *(uint32_t *) (&ctrl->vlan_tag) |= qp->doorbell_qpn; |
|
838 /* |
|
839 @@ -589,6 +590,58 @@ |
827 ; /* nothing */ |
840 ; /* nothing */ |
828 } |
841 } |
829 |
842 |
830 +#if defined(__SVR4) && defined(__sun) |
843 +#if defined(__SVR4) && defined(__sun) |
831 +int mlx4_set_qp_buf(struct ibv_pd *pd, struct mlx4_qp *qp, void *qpbuf, |
844 +int mlx4_set_qp_buf(struct ibv_pd *pd, struct mlx4_qp *qp, void *qpbuf, |