From d4d15effa3abf6817fab4e3e93afb4f1d18cf683 Mon Sep 17 00:00:00 2001 From: Hal Rosenstock Date: Wed, 27 Jul 2005 11:45:28 -0700 Subject: [PATCH] --- yaml --- r: 5211 b: refs/heads/master c: df9f9ead746e9607099d7024f312133944173609 h: refs/heads/master i: 5209: 4e340ec6347985eee43dbf2fbf873f8d46215723 5207: 366684216aff9bb686e79d1862e6a10387eac1ff v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/mad.c | 9 +-------- trunk/drivers/infiniband/include/ib_mad.h | 3 +-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index d16c25b04029..93e7b2a92258 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f68bcc2df8115b4ea45bfa4f8de22ec7232562b5 +refs/heads/master: df9f9ead746e9607099d7024f312133944173609 diff --git a/trunk/drivers/infiniband/core/mad.c b/trunk/drivers/infiniband/core/mad.c index 9719fa6c14f7..430a6ee89877 100644 --- a/trunk/drivers/infiniband/core/mad.c +++ b/trunk/drivers/infiniband/core/mad.c @@ -796,9 +796,9 @@ struct ib_mad_send_buf * ib_create_send_mad(struct ib_mad_agent *mad_agent, buf = kmalloc(sizeof *send_buf + buf_size, gfp_mask); if (!buf) return ERR_PTR(-ENOMEM); + memset(buf, 0, sizeof *send_buf + buf_size); send_buf = buf + buf_size; - memset(send_buf, 0, sizeof *send_buf); send_buf->mad = buf; send_buf->sge.addr = dma_map_single(mad_agent->device->dma_device, @@ -1021,13 +1021,6 @@ void ib_free_recv_mad(struct ib_mad_recv_wc *mad_recv_wc) } EXPORT_SYMBOL(ib_free_recv_mad); -void ib_coalesce_recv_mad(struct ib_mad_recv_wc *mad_recv_wc, - void *buf) -{ - printk(KERN_ERR PFX "ib_coalesce_recv_mad() not implemented yet\n"); -} -EXPORT_SYMBOL(ib_coalesce_recv_mad); - struct ib_mad_agent *ib_redirect_mad_qp(struct ib_qp *qp, u8 rmpp_version, ib_mad_send_handler send_handler, diff --git a/trunk/drivers/infiniband/include/ib_mad.h b/trunk/drivers/infiniband/include/ib_mad.h index a6f06b8c4acf..e8a122122cba 100644 --- a/trunk/drivers/infiniband/include/ib_mad.h +++ b/trunk/drivers/infiniband/include/ib_mad.h @@ -365,8 +365,7 @@ int ib_post_send_mad(struct ib_mad_agent *mad_agent, * This call copies a chain of received RMPP MADs into a single data buffer, * removing duplicated headers. */ -void ib_coalesce_recv_mad(struct ib_mad_recv_wc *mad_recv_wc, - void *buf); +void ib_coalesce_recv_mad(struct ib_mad_recv_wc *mad_recv_wc, void *buf); /** * ib_free_recv_mad - Returns data buffers used to receive a MAD to the