From patchwork Wed Nov 10 16:28:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1553499 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=corigine.onmicrosoft.com header.i=@corigine.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-corigine-onmicrosoft-com header.b=jMesmBTs; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hq9L22W47z9sRN for ; Thu, 11 Nov 2021 03:29:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9044D60B1D; Wed, 10 Nov 2021 16:29:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kRqCFy2ITcg8; Wed, 10 Nov 2021 16:29:39 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 97B2860AED; Wed, 10 Nov 2021 16:29:37 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id BD369C0046; Wed, 10 Nov 2021 16:29:35 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 054B0C003C for ; Wed, 10 Nov 2021 16:29:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B196240444 for ; Wed, 10 Nov 2021 16:29:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=corigine.onmicrosoft.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A2rykp5sKcTp for ; Wed, 10 Nov 2021 16:29:31 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20706.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe59::706]) by smtp2.osuosl.org (Postfix) with ESMTPS id A0F0740432 for ; Wed, 10 Nov 2021 16:29:30 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AFRt5S+rZxC9ub0J5c45T44Ah+AkLoa6MDEjwkIM0G4IaZP5GrBpe3H+uH6OvuBy51ovJIkF7ogDcOhJjfTirunH/apuRv6im1H809T/uTvOpd39niPhcs+VDCiwn0FgDgzkCVTyFMHM30pv3bGbYpUf7z96Bjh30awI+kxOxGw2dIuc4HB5dftA7iX9fuvfY7pUh4xD95DstbK/NSSOwAcmt1OKOnj/Epl+rQOTZsLzc3CVYpj31LHOM9YYZ0atOssUN45wLzSy6ITj5aYn3mDq8SkMuStBja8/k/kVwOEsmyUSqZ3Gn6aRYXsZ0jdDzD9et3gksT4JLH8trd5HuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Vl6z4Uq/QEWSDHyFto2Rwexln+fpJmBO79SRLeQIjfM=; b=TMY6bFyR0xF/u0liUR/MeSbs8TuJOVFxluBkMlSyVDOUFmwh8HLAtEJEmd/fSthYNIDhf2h7EPufpdA34oqBnQ4/0yBmgUnnUdq4Mr/750dIPU9U6Bvt1oNFy+d2UPj0fMwzZFq4JxOqOeWuh9WiEIepg9vUxT1TxielIfJ6IPSLZLMNYN4tytZpYibXyQ6jNLHBjNtJE/PTfslDohrtZOMjTIDD6VZAhWa9QRC5kHcshmR4Sz3tE71pWFLgsG1BJPL6V2KGBwWcZTZHwKWmbhRigowjeVM1boqfKVOMMhYqbHpxhStY8k71QoDwApPPbarbZ4N2BYY5Ca8WLCSkaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vl6z4Uq/QEWSDHyFto2Rwexln+fpJmBO79SRLeQIjfM=; b=jMesmBTs41s0ch0qYETaT52CdbllA+Td7Uc/7MkEjftJctU+buOB2TfDBuzldgW36WV6lgR6lXclcKGFrlyR+FbQ20Tak/7v4hiX/fk5OeRNjjhnUALIKTbeLGFnsD2jLQToF75LL/V/9VXy+LYG/sZF9i2Gv3mMQh5DRN861L0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) by PH0PR13MB5639.namprd13.prod.outlook.com (2603:10b6:510:12a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.14; Wed, 10 Nov 2021 16:29:29 +0000 Received: from PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::e1d9:64d0:cb4f:3e90]) by PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::e1d9:64d0:cb4f:3e90%9]) with mapi id 15.20.4690.005; Wed, 10 Nov 2021 16:29:29 +0000 From: Simon Horman To: dev@openvswitch.org Date: Wed, 10 Nov 2021 17:28:56 +0100 Message-Id: <20211110162858.20101-6-simon.horman@corigine.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211110162858.20101-1-simon.horman@corigine.com> References: <20211110162858.20101-1-simon.horman@corigine.com> X-ClientProxiedBy: AM0PR02CA0224.eurprd02.prod.outlook.com (2603:10a6:20b:28f::31) To PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) MIME-Version: 1.0 Received: from madeliefje.horms.nl (80.113.23.202) by AM0PR02CA0224.eurprd02.prod.outlook.com (2603:10a6:20b:28f::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 16:29:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7217f055-691f-4033-82de-08d9a4674488 X-MS-TrafficTypeDiagnostic: PH0PR13MB5639: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:17; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BDDc1Sjklu5vcrW5UjeY6dZd4u1erq7BW3xajKAhMw9Ud3fjm90KBsy0GN4NG/lxXfhbv6IF4BHSTr43kxJkuaf6DE4XdfFfACJxwxlR/voMkeUoXiJ/qxlFm/cHmKgtexEjt3ZcOZ1FwgFoMQj6llxVq7AVYLq9lM+DNlQ+QtuACSLH+uwiQbjTTOPqfD8KkgVMbyb8mjz37CwV7PgIHtKZL5h0S8U36CVvD29C9YXiDDGoJxuWVUEmdG2Kbg9D3l4a5h74ZCCZreOfgCYoDjZIs4YYTI+JNK9aoOQpQKBHQmUjAtC2PmBgQdphqZglBPeq/n2nPwN1HRNcWpgcFIa65zH4EiAiC4q68YiLFZpTsO0kG3Pa0PQvpkQPNC1KsJQ/boSnH2iYjGxKn4+vOnhXeWBt9SfOEhmN31O6gC7/KAnf4hh73UlxzbmywuTusj6Z/kfqmNXQYVicnVPi+5vOYQcSbawB0KKkJaWjB2NRWtlX/L+FGuTa7szw8E4f3ENouozBZRVuVcgVCjIrilerVjwnhxD87aFQRkYIN+H25JLyLFpPaw5lGAc/Yuu9sg08xXdlh+86xjciErHktDWNMY7+egkqY8X17aCR3vO1ttK1YWMormvyAPLE2M482ecGJKlDiGU3+S+IaAnOc9YzzUuWhhThOXNywLqhVwHrI9jGxONS+j1KrnnFG0rfxvPj1MqglMq3RG+5aCI/Cw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR13MB4842.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(346002)(376002)(396003)(39830400003)(366004)(136003)(1076003)(36756003)(86362001)(8676002)(66946007)(54906003)(107886003)(6512007)(44832011)(6666004)(316002)(83380400001)(6916009)(956004)(66476007)(508600001)(4326008)(5660300002)(8936002)(2906002)(6506007)(52116002)(186003)(6486002)(26005)(38100700002)(38350700002)(66556008)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?SVE1VHAhMWPG5zjVoeM/5VX2Qt4e?= =?utf-8?q?wS2ZidSsnW7M0ttiLrx53qzYhVgvMccAdgo72DOAay8ZvHzX9ewzUoIlIWXdXtUKq?= =?utf-8?q?FfGFwXaIwSS3ZKym1R0UKUm9c2gcIhV03WpjeLwfqaSfzTbuJW3/y23O4wV03YNdR?= =?utf-8?q?wuG9Ixz2rgIfJEOEv1ecS3dauq89EbRdQ6obB7aKfvv6T+iLLqRaWZfn9PJ+vuXAF?= =?utf-8?q?p2IxZAvg7vTIWDhXSMk/yx7dZv2cNo9Uh6sgal81OKatRAw5VnBTAEa5xjIltDIzD?= =?utf-8?q?Q1bA3Aafe1b5juyYcEaPzUDLNPZorFrIUk4ZIgmTmOf13OtKbNko9gOqvdyWbz6Vr?= =?utf-8?q?TjWBhcxgyZAR+fHrYMz0hVer4VW42cJ+58+tmLScN7OpF0lMznaQCSBHLNaNtO+Pt?= =?utf-8?q?6mjY61skyrKQY/er21iwPu1x17HvJ3oyfYdPFhf2pQ1drELANh0e1Vhviqk6cS1v9?= =?utf-8?q?5mYLWRa1mduPeO2G/KzgkH+WbNcvuRj0oN6WmcWZCd/J/RbuVVDl5FSX2KvG422al?= =?utf-8?q?T1lb7QD96TuJwReBW7UR26E3/IPVUdffxaWnH6z2JIHKjCt8SQxIh2nktf1tVcS9+?= =?utf-8?q?FsOlbeJUYCCg2FkryGGeES7vXwTxgFlBz4ETDoeJX+qj4V+O75be5cGA30msp0hny?= =?utf-8?q?uu53VZrHr1leq+MFmyaMiT4BX0uHAv6d334Ojk4PluGKqMgyOVO6I4HaN178LrN8W?= =?utf-8?q?JMFYQyjsxr5oT0cly/bFRIzbOLH8yEKAPUoPR3MEGTO5ebLEDMdWpGDXPH9C3Iv2t?= =?utf-8?q?5gvVhVIUmIYPx3f0f/VKDvef8dSf3+RETzmlxVYSmJSfldDYoHShsxfW0mZJB/tzc?= =?utf-8?q?Fl31itfxIQ9nsXFDjfX4rBerVkgOVOalsuC1zaEGjNDXi0EA+B4IO/nSyccvxc4Jt?= =?utf-8?q?Zu4eIs29QLWUYj/pKQV3n1wquREnOB5PokdvN+5OzW/VwQQNHWE3Uec5CkaJy7y0I?= =?utf-8?q?9fH8YIfU+A3ZQaDtacnPRtUiF7Izn5a1SlcsY4JkVMhO5GVtjlI/T3YXeEDgB8g/6?= =?utf-8?q?UjY3tqXCwH0hAqiAFdNl0vNCJ1IjYFclmOphOSZpvPO3gTS+ObrVx3APTadWXzrqU?= =?utf-8?q?PdhWjeBT4CSBaIs0e9ZI6AOGA2d3GqnFfQ8oVqEJIKVeDalPUGtOUwWtVXXOTtoWw?= =?utf-8?q?TZV29dkYnB2w3tkH+fVS7qA+/iNP1wiDQAwdla6MqynNSDRbDRzLsW7hZd3elfOmf?= =?utf-8?q?hj+WGd9TcIk3Pie0S60xTi8Yi2HWNA0BX26+Vf43cOkhk/H43fDq1q2IevpM3Trhp?= =?utf-8?q?lPHpWQpxZyVBfaGKrTtvZE6ilaIgO7fC8ma3ZSSwjh9cacN9HVdRETMDM+GShUvoO?= =?utf-8?q?JlZ3VcylPCXPP/1qEdNWfyCr39KEixb8T+HuNeoeB0ZUg1Fm0/l3ON5N85vPKkc4f?= =?utf-8?q?ZT++Z0epXtzy1VkKPCFkKAsAagcK5a8nPZiEBg9NAQffr5RnfKgmWoIJzTnRgZWTG?= =?utf-8?q?2av5saZtnL45052XYMBaGw2Dz3I3n9+8ENJvs4XbmticLl7zDlmEycKlP712eIgcG?= =?utf-8?q?zPZLt7Gfs+ZL8pDdzOKh5eIHpoTh99QjRu+OkFf9CITUEZG4BD8sEiWwFbffuUSKX?= =?utf-8?q?fDBAW7dkzM9dBd7XB17uyxC4FJO4sm9WA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7217f055-691f-4033-82de-08d9a4674488 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 16:29:28.9343 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NtJ971h8UeBDn850CREvwFPLk6JT7BQdyPWdCkZRASWMNxqPaOSrcZkFzHiCFLamRvj6gciIgQQEmxqokvX8iypjBvV+FsXUuoTCNYWaxBw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5639 Cc: Baowen Zheng , Tianyu Yuan , oss-drivers@corigine.com Subject: [ovs-dev] [PATCH/RFC 5/7] dpif: replace n_handlers with n_handlers_ X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Tianyu Yuan A following commit will include "ofproto-dpif.h" in "dpif-netlink.c", in order to use "struct dpif_backer". However this method will result in the declaration of ‘n_handlers’ shadowing a global declaration. Address this by replacing n_handlers with n_handlers_ in relavant function definitions. Signed-off-by: Tianyu Yuan Signed-off-by: Simon Horman --- lib/dpif-netlink.c | 40 ++++++++++++++++++++-------------------- lib/dpif.c | 8 ++++---- lib/dpif.h | 4 ++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c index 81eb19c51..d270dbbd2 100644 --- a/lib/dpif-netlink.c +++ b/lib/dpif-netlink.c @@ -2509,17 +2509,17 @@ dpif_netlink_refresh_handlers_cpu_dispatch(struct dpif_netlink *dpif) { int handler_id; int error = 0; - uint32_t n_handlers; + uint32_t n_handlers_; uint32_t *upcall_pids; - n_handlers = count_cpu_cores(); - if (dpif->n_handlers != n_handlers) { + n_handlers_ = count_cpu_cores(); + if (dpif->n_handlers != n_handlers_) { VLOG_DBG("Dispatch mode(per-cpu): initializing %d handlers", - n_handlers); + n_handlers_); destroy_all_handlers(dpif); - upcall_pids = xzalloc(n_handlers * sizeof *upcall_pids); - dpif->handlers = xzalloc(n_handlers * sizeof *dpif->handlers); - for (handler_id = 0; handler_id < n_handlers; handler_id++) { + upcall_pids = xzalloc(n_handlers_ * sizeof *upcall_pids); + dpif->handlers = xzalloc(n_handlers_ * sizeof *dpif->handlers); + for (handler_id = 0; handler_id < n_handlers_; handler_id++) { struct dpif_handler *handler = &dpif->handlers[handler_id]; error = create_nl_sock(dpif, &handler->sock); if (error) { @@ -2533,9 +2533,9 @@ dpif_netlink_refresh_handlers_cpu_dispatch(struct dpif_netlink *dpif) handler_id, upcall_pids[handler_id]); } - dpif->n_handlers = n_handlers; + dpif->n_handlers = n_handlers_; error = dpif_netlink_set_handler_pids(&dpif->dpif, upcall_pids, - n_handlers); + n_handlers_); free(upcall_pids); } return error; @@ -2547,7 +2547,7 @@ dpif_netlink_refresh_handlers_cpu_dispatch(struct dpif_netlink *dpif) * backing kernel vports. */ static int dpif_netlink_refresh_handlers_vport_dispatch(struct dpif_netlink *dpif, - uint32_t n_handlers) + uint32_t n_handlers_) OVS_REQ_WRLOCK(dpif->upcall_lock) { unsigned long int *keep_channels; @@ -2559,13 +2559,13 @@ dpif_netlink_refresh_handlers_vport_dispatch(struct dpif_netlink *dpif, int retval = 0; size_t i; - ovs_assert(!WINDOWS || n_handlers <= 1); + ovs_assert(!WINDOWS || n_handlers_ <= 1); ovs_assert(!WINDOWS || dpif->n_handlers <= 1); - if (dpif->n_handlers != n_handlers) { + if (dpif->n_handlers != n_handlers_) { destroy_all_channels(dpif); - dpif->handlers = xzalloc(n_handlers * sizeof *dpif->handlers); - for (i = 0; i < n_handlers; i++) { + dpif->handlers = xzalloc(n_handlers_ * sizeof *dpif->handlers); + for (i = 0; i < n_handlers_; i++) { int error; struct dpif_handler *handler = &dpif->handlers[i]; @@ -2583,10 +2583,10 @@ dpif_netlink_refresh_handlers_vport_dispatch(struct dpif_netlink *dpif, return error; } } - dpif->n_handlers = n_handlers; + dpif->n_handlers = n_handlers_; } - for (i = 0; i < n_handlers; i++) { + for (i = 0; i < n_handlers_; i++) { struct dpif_handler *handler = &dpif->handlers[i]; handler->event_offset = handler->n_events = 0; @@ -2719,7 +2719,7 @@ dpif_netlink_recv_set(struct dpif *dpif_, bool enable) } static int -dpif_netlink_handlers_set(struct dpif *dpif_, uint32_t n_handlers) +dpif_netlink_handlers_set(struct dpif *dpif_, uint32_t n_handlers_) { struct dpif_netlink *dpif = dpif_netlink_cast(dpif_); int error = 0; @@ -2738,7 +2738,7 @@ dpif_netlink_handlers_set(struct dpif *dpif_, uint32_t n_handlers) error = dpif_netlink_refresh_handlers_cpu_dispatch(dpif); } else { error = dpif_netlink_refresh_handlers_vport_dispatch(dpif, - n_handlers); + n_handlers_); } } fat_rwlock_unlock(&dpif->upcall_lock); @@ -2747,12 +2747,12 @@ dpif_netlink_handlers_set(struct dpif *dpif_, uint32_t n_handlers) } static bool -dpif_netlink_number_handlers_required(struct dpif *dpif_, uint32_t *n_handlers) +dpif_netlink_number_handlers_required(struct dpif *dpif_, uint32_t *n_handlers_) { struct dpif_netlink *dpif = dpif_netlink_cast(dpif_); if (dpif_netlink_upcall_per_cpu(dpif)) { - *n_handlers = count_cpu_cores(); + *n_handlers_ = count_cpu_cores(); return true; } diff --git a/lib/dpif.c b/lib/dpif.c index 069f17863..3d4eae1a6 100644 --- a/lib/dpif.c +++ b/lib/dpif.c @@ -1478,12 +1478,12 @@ dpif_recv_set(struct dpif *dpif, bool enable) * * Returns 0 if successful, otherwise a positive errno value. */ int -dpif_handlers_set(struct dpif *dpif, uint32_t n_handlers) +dpif_handlers_set(struct dpif *dpif, uint32_t n_handlers_) { int error = 0; if (dpif->dpif_class->handlers_set) { - error = dpif->dpif_class->handlers_set(dpif, n_handlers); + error = dpif->dpif_class->handlers_set(dpif, n_handlers_); log_operation(dpif, "handlers_set", error); } return error; @@ -1497,10 +1497,10 @@ dpif_handlers_set(struct dpif *dpif, uint32_t n_handlers) * If not, returns 'false' */ bool -dpif_number_handlers_required(struct dpif *dpif, uint32_t *n_handlers) +dpif_number_handlers_required(struct dpif *dpif, uint32_t *n_handlers_) { if (dpif->dpif_class->number_handlers_required) { - return dpif->dpif_class->number_handlers_required(dpif, n_handlers); + return dpif->dpif_class->number_handlers_required(dpif, n_handlers_); } return false; } diff --git a/lib/dpif.h b/lib/dpif.h index 4398a4077..14f1d4d3f 100644 --- a/lib/dpif.h +++ b/lib/dpif.h @@ -874,8 +874,8 @@ typedef int upcall_callback(const struct dp_packet *packet, void dpif_register_upcall_cb(struct dpif *, upcall_callback *, void *aux); int dpif_recv_set(struct dpif *, bool enable); -int dpif_handlers_set(struct dpif *, uint32_t n_handlers); -bool dpif_number_handlers_required(struct dpif *, uint32_t *n_handlers); +int dpif_handlers_set(struct dpif *, uint32_t n_handlers_); +bool dpif_number_handlers_required(struct dpif *, uint32_t *n_handlers_); int dpif_set_config(struct dpif *, const struct smap *cfg); int dpif_port_set_config(struct dpif *, odp_port_t, const struct smap *cfg); int dpif_recv(struct dpif *, uint32_t handler_id, struct dpif_upcall *,