diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 09:52:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 09:52:04 -0800 |
| commit | 0f66c08e9611b9a63f2f2fd5af0d12e486c4a02e (patch) | |
| tree | 0e36f48f32c97c4ef9ed5fcd6158226345f43d2e /drivers/infiniband/hw/ehca/ehca_av.c | |
| parent | 4dd7406e9c7e7a5422425ef699780463490b8745 (diff) | |
| parent | 39798695b4bcc7b145f8910ca56195808d3a7637 (diff) | |
| download | op-kernel-dev-0f66c08e9611b9a63f2f2fd5af0d12e486c4a02e.zip op-kernel-dev-0f66c08e9611b9a63f2f2fd5af0d12e486c4a02e.tar.gz | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IB/mad: Fix race between cancel and receive completion
RDMA/amso1100: Fix && typo
RDMA/amso1100: Fix unitialized pseudo_netdev accessed in c2_register_device
IB/ehca: Activate scaling code by default
IB/ehca: Use named constant for max mtu
IB/ehca: Assure 4K alignment for firmware control blocks
Diffstat (limited to 'drivers/infiniband/hw/ehca/ehca_av.c')
| -rw-r--r-- | drivers/infiniband/hw/ehca/ehca_av.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_av.c b/drivers/infiniband/hw/ehca/ehca_av.c index 3bac197..214e2fd 100644 --- a/drivers/infiniband/hw/ehca/ehca_av.c +++ b/drivers/infiniband/hw/ehca/ehca_av.c @@ -118,8 +118,7 @@ struct ib_ah *ehca_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr) } memcpy(&av->av.grh.word_1, &gid, sizeof(gid)); } - /* for the time being we use a hard coded PMTU of 2048 Bytes */ - av->av.pmtu = 4; + av->av.pmtu = EHCA_MAX_MTU; /* dgid comes in grh.word_3 */ memcpy(&av->av.grh.word_3, &ah_attr->grh.dgid, @@ -193,7 +192,7 @@ int ehca_modify_ah(struct ib_ah *ah, struct ib_ah_attr *ah_attr) memcpy(&new_ehca_av.grh.word_1, &gid, sizeof(gid)); } - new_ehca_av.pmtu = 4; /* see also comment in create_ah() */ + new_ehca_av.pmtu = EHCA_MAX_MTU; memcpy(&new_ehca_av.grh.word_3, &ah_attr->grh.dgid, sizeof(ah_attr->grh.dgid)); |
