From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262524AbVGKUNs (ORCPT ); Mon, 11 Jul 2005 16:13:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262556AbVGKULx (ORCPT ); Mon, 11 Jul 2005 16:11:53 -0400 Received: from mailgw.voltaire.com ([212.143.27.70]:47820 "EHLO mailgw.voltaire.com") by vger.kernel.org with ESMTP id S262534AbVGKUKD (ORCPT ); Mon, 11 Jul 2005 16:10:03 -0400 Subject: PATCH 9/29v2] Add ib_coalesce_recv_mad to MAD From: Hal Rosenstock To: Andrew Morton Cc: linux-kernel@vger.kernel.org, openib-general@openib.org Content-Type: text/plain Organization: Message-Id: <1121110291.4389.5002.camel@hal.voltaire.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 (1.2.2-4) Date: 11 Jul 2005 16:02:25 -0400 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Add implementation for ib_coalesce_recv_mad. Also, clear allocated MAD data buffer in ib_create_send_mad. Signed-off-by: Sean Hefty Signed-off-by: Hal Rosenstock This patch depends on patch 8/29. -- core/mad.c | 9 +-- include/ib_mad.h | 3 +-- 2 files changed, 2 insertions(+), 10 deletions(-) diff -uprN linux-2.6.13-rc2-mm1-8/drivers/infiniband/core/mad.c linux-2.6.13-rc2-mm1-9/drivers/infiniband/core/mad.c -- linux-2.6.13-rc2-mm1-8/drivers/infiniband/core/mad.c 2005-07-11 13:36:47.000000000 -0400 +++ linux-2.6.13-rc2-mm1-9/drivers/infiniband/core/mad.c 2005-07-11 13:37:10.000000000 -0400 @@ -796,9 +796,9 @@ struct ib_mad_send_buf * ib_create_send_ 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 } 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 -uprN linux-2.6.13-rc2-mm1-8/drivers/infiniband/include/ib_mad.h linux-2.6.13-rc2-mm1-9/drivers/infiniband/include/ib_mad.h -- linux-2.6.13-rc2-mm1-8/drivers/infiniband/include/ib_mad.h 2005-07-11 13:36:45.000000000 -0400 +++ linux-2.6.13-rc2-mm1-9/drivers/infiniband/include/ib_mad.h 2005-07-11 13:36:58.000000000 -0400 @@ -365,8 +365,7 @@ int ib_post_send_mad(struct ib_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