From 448c6fb3a39bf4d0b644f5b942b7aa9473b0f597 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Sat, 19 Jan 2013 02:02:27 -0700 Subject: NTB: Out of free receive entries issue If the NTB client driver enqueues the maximum number of rx buffers, it will not be able to re-enqueue another in its callback handler due to a lack of free entries. This can be avoided by adding the current entry to the free queue prior to calling the client callback handler. With this change, ntb_netdev will no longer encounter a rx error on its first packet. Signed-off-by: Jon Mason Signed-off-by: Greg Kroah-Hartman --- drivers/ntb/ntb_transport.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c index 69c58da0fa34..b3afb2442dc0 100644 --- a/drivers/ntb/ntb_transport.c +++ b/drivers/ntb/ntb_transport.c @@ -910,12 +910,15 @@ void ntb_transport_free(void *transport) static void ntb_rx_copy_task(struct ntb_transport_qp *qp, struct ntb_queue_entry *entry, void *offset) { - memcpy(entry->buf, offset, entry->len); + void *cb_data = entry->cb_data; + unsigned int len = entry->len; - if (qp->rx_handler && qp->client_ready == NTB_LINK_UP) - qp->rx_handler(qp, qp->cb_data, entry->cb_data, entry->len); + memcpy(entry->buf, offset, entry->len); ntb_list_add(&qp->ntb_rx_free_q_lock, &entry->entry, &qp->rx_free_q); + + if (qp->rx_handler && qp->client_ready == NTB_LINK_UP) + qp->rx_handler(qp, qp->cb_data, cb_data, len); } static int ntb_process_rxc(struct ntb_transport_qp *qp) -- cgit v1.2.3