From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 06433A0C47 for ; Fri, 19 Nov 2021 06:03:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ED23D410FB; Fri, 19 Nov 2021 06:03:11 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 03CB740140; Fri, 19 Nov 2021 06:03:08 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1AIJ6c4X030437; Thu, 18 Nov 2021 21:03:07 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=2qOrPybkOgN+4u+H77qEdihWMlVCnn4yrXC0TfRy1SA=; b=URhN/PwGMyCkQHkaWLL10w0qhV9qV2qn3vYk/rM8iBNEsUUgDX/wNiy7cH35x85RKWdU mvM6zFRMHFUDNtO4SREbA58h2zmAl4LkV7QiU6VbRWahCzCy/MKqf7N1y+fY/5WeoVGa o7bFogSOMpJ3aCRIiG9dZatFbNIEmpkZWRqzE5xUzcy87X0OEp1ZUIlPJ7G7Nd1KTos8 RDnSYF1HQMVG24yUq9wA4kDI+dIhoO7C3AfiDGXQbHY5Q6WEjxlLwbptna9hSPgKkRan ZlSxQYs+NZZn+Om5L4ak08G8CEGIkLRRswmML13dS8QKK9STuN7wHYPtCzGdNuTxd/p2 SQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3cdvprt1cw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 18 Nov 2021 21:03:03 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 18 Nov 2021 21:03:01 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Thu, 18 Nov 2021 21:03:01 -0800 Received: from jerin-lab.marvell.com (jerin-lab.marvell.com [10.28.34.14]) by maili.marvell.com (Postfix) with ESMTP id 463623F7093; Thu, 18 Nov 2021 21:02:59 -0800 (PST) From: To: Jakub Grajciar , Stephen Hemminger CC: , , , "Jerin Jacob" , Subject: [dpdk-dev] [PATCH] doc: fix memif driver acronyms Date: Fri, 19 Nov 2021 10:29:26 +0530 Message-ID: <20211119045926.1800726-1-jerinj@marvell.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: NoF3Sa9M4cm4j7_KVRcYbO1aT0oR3UjJ X-Proofpoint-GUID: NoF3Sa9M4cm4j7_KVRcYbO1aT0oR3UjJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-19_02,2021-11-17_01,2020-04-07_01 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org From: Jerin Jacob The commit d250589d5702 ("net/memif: replace master/slave arguments") replaced master/slave terms to server/client terms. Fix the documentation to reflect the same. Fixes: d250589d5702 ("net/memif: replace master/slave arguments") Cc: stable@dpdk.org Signed-off-by: Jerin Jacob --- doc/guides/nics/memif.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/guides/nics/memif.rst b/doc/guides/nics/memif.rst index d783f2d4a4..aca843640b 100644 --- a/doc/guides/nics/memif.rst +++ b/doc/guides/nics/memif.rst @@ -107,13 +107,13 @@ region n (no-zero-copy): +-----------------------+-------------------------------------------------------------------------+ | Rings | Buffers | +-----------+-----------+-----------------+---+---------------------------------------------------+ -| S2M rings | M2S rings | packet buffer 0 | . | pb ((1 << pmd->run.log2_ring_size)*(s2m + m2s))-1 | +| C2S rings | S2C rings | packet buffer 0 | . | pb ((1 << pmd->run.log2_ring_size)*(c2s + s2c))-1 | +-----------+-----------+-----------------+---+---------------------------------------------------+ -S2M OR M2S Rings: +C2S OR S2C Rings: +--------+--------+-----------------------+ -| ring 0 | ring 1 | ring num_s2m_rings - 1| +| ring 0 | ring 1 | ring num_c2s_rings - 1| +--------+--------+-----------------------+ ring 0: @@ -123,8 +123,8 @@ ring 0: +-------------+---------------------------------------+ Descriptors are assigned packet buffers in order of rings creation. If we have one ring -in each direction and ring size is 1024, then first 1024 buffers will belong to S2M ring and -last 1024 will belong to M2S ring. In case of zero-copy, buffers are dequeued and +in each direction and ring size is 1024, then first 1024 buffers will belong to C2S ring and +last 1024 will belong to S2C ring. In case of zero-copy, buffers are dequeued and enqueued as needed. **Descriptor format** @@ -193,7 +193,7 @@ region 0: +-----------------------+ | Rings | +-----------+-----------+ -| S2M rings | M2S rings | +| C2S rings | S2C rings | +-----------+-----------+ region n: -- 2.34.0