From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 96608A0096 for ; Wed, 10 Apr 2019 21:23:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E0FD21B2AC; Wed, 10 Apr 2019 21:23:45 +0200 (CEST) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by dpdk.org (Postfix) with ESMTP id C71571B1F6 for ; Wed, 10 Apr 2019 21:23:44 +0200 (CEST) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x3AJ9Hf7064359 for ; Wed, 10 Apr 2019 15:23:44 -0400 Received: from e15.ny.us.ibm.com (e15.ny.us.ibm.com [129.33.205.205]) by mx0a-001b2d01.pphosted.com with ESMTP id 2rsncbbbb2-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 10 Apr 2019 15:23:43 -0400 Received: from localhost by e15.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 10 Apr 2019 20:23:42 +0100 Received: from b01cxnp23033.gho.pok.ibm.com (9.57.198.28) by e15.ny.us.ibm.com (146.89.104.202) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 10 Apr 2019 20:23:40 +0100 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp23033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x3AJNdan32243956 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 10 Apr 2019 19:23:39 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 46EA6B205F; Wed, 10 Apr 2019 19:23:39 +0000 (GMT) Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D5833B2064; Wed, 10 Apr 2019 19:23:38 +0000 (GMT) Received: from oprom9.localdomain (unknown [9.40.204.34]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP; Wed, 10 Apr 2019 19:23:38 +0000 (GMT) From: David Christensen To: konstantin.ananyev@intel.com Cc: dev@dpdk.org, radhika.chirra@ibm.com, David Christensen , stable@dpdk.org Date: Wed, 10 Apr 2019 14:23:31 -0500 X-Mailer: git-send-email 1.8.3.1 X-TM-AS-GCONF: 00 x-cbid: 19041019-0068-0000-0000-000003B3492C X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010904; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000284; SDB=6.01187190; UDB=6.00621838; IPR=6.00967953; MB=3.00026380; MTD=3.00000008; XFM=3.00000015; UTC=2019-04-10 19:23:42 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19041019-0069-0000-0000-0000481C85FE Message-Id: <1554924211-11946-1-git-send-email-drc@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-04-10_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=693 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904100125 Subject: [dpdk-dev] [PATCH] bpf: rename bpf_validate() to rte_bpf_validate() to avoid collisions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190410192331.mnCD0Dzk30DfoC_2Jdbaw7kUKUFxt5fYgnpsAN5Cn3Q@z> When using libpcap libraries the error "multiple definition of 'bpf_validate'" is observed. Rename the DPDK version to rte_bpf_validate to be more consistenet with other DPDK defined functions. Cc: stable@dpdk.org Signed-off-by: David Christensen Tested-by: Radhika Chirra --- lib/librte_bpf/bpf_impl.h | 2 +- lib/librte_bpf/bpf_load.c | 2 +- lib/librte_bpf/bpf_validate.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/librte_bpf/bpf_impl.h b/lib/librte_bpf/bpf_impl.h index b577e2c..f1d6f9a 100644 --- a/lib/librte_bpf/bpf_impl.h +++ b/lib/librte_bpf/bpf_impl.h @@ -21,7 +21,7 @@ struct rte_bpf { uint32_t stack_sz; }; -extern int bpf_validate(struct rte_bpf *bpf); +extern int rte_bpf_validate(struct rte_bpf *bpf); extern int bpf_jit(struct rte_bpf *bpf); diff --git a/lib/librte_bpf/bpf_load.c b/lib/librte_bpf/bpf_load.c index d9d163b..bd9eebf 100644 --- a/lib/librte_bpf/bpf_load.c +++ b/lib/librte_bpf/bpf_load.c @@ -115,7 +115,7 @@ return NULL; } - rc = bpf_validate(bpf); + rc = rte_bpf_validate(bpf); if (rc == 0) { bpf_jit(bpf); if (mprotect(bpf, bpf->sz, PROT_READ) != 0) diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c index 83983ef..12c34f0 100644 --- a/lib/librte_bpf/bpf_validate.c +++ b/lib/librte_bpf/bpf_validate.c @@ -2209,7 +2209,7 @@ struct bpf_ins_check { } int -bpf_validate(struct rte_bpf *bpf) +rte_bpf_validate(struct rte_bpf *bpf) { int32_t rc; struct bpf_verifier bvf; -- 1.8.3.1