From patchwork Fri Aug 27 07:40:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: miter X-Patchwork-Id: 1521631 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=outlook.com header.i=@outlook.com header.a=rsa-sha256 header.s=selector1 header.b=RAotNlfc; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 ozlabs.org (Postfix) with ESMTPS id 4Gwwvt2fGjz9sCD for ; Fri, 27 Aug 2021 20:30:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 40548406D5; Fri, 27 Aug 2021 10:30:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 9kuSx_x_XP-2; Fri, 27 Aug 2021 10:30:11 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 5034B407BF; Fri, 27 Aug 2021 10:30:10 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1FCA6C0010; Fri, 27 Aug 2021 10:30:10 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 123F4C000E for ; Fri, 27 Aug 2021 10:30:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E3AFE80B9D for ; Fri, 27 Aug 2021 10:30:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=outlook.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iOp4d8bGMwGC for ; Fri, 27 Aug 2021 10:30:06 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from AUS01-ME3-obe.outbound.protection.outlook.com (mail-me3aus01olkn2144.outbound.protection.outlook.com [40.92.63.144]) by smtp1.osuosl.org (Postfix) with ESMTPS id 9F2F680B38 for ; Fri, 27 Aug 2021 10:30:06 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V5d2a3a7RhYFPgcsQhGw4Asy0PkzlbPgBZ0YQfomiSidwpOqS4oVqU2ZR1OL9yMHkQNctO3yLTBe/u6oAokQ0zUSH/Lw46LFXXTDKHAaqng73Pq4oEbGnS2u+6k6oFhOPS7+aOHb++2DrbYn1ewLelpAhUVyXMwY706AakmXQHM5lisLKkQZCgRbs3m+pTFnMeQT0+UsM/Dcghx2VCLYszBypoUyztL5NBX2j9pzqHEMVlQaOzQxYTSWG6A1C6jMtTdWpoL80AY0BZxHTIpaQtGsZwYW9FsNIW6ROCqN/wdokVXliEUgkSdMym8JXqCvlgIB9SQIBi7cFDzNL9ZLmA== 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-SenderADCheck; bh=A5pVEnGVa68oseq/89PtwnnLremGLcB2D5ysV/SaJ8c=; b=Xrkh/03D1EDu3taO/ph2scb2ay5NspJwCKCv+yvYxzRGmwR0TiP2awwBRgv+1HJmM70fQanup9prnVK3uGmX8r/pz6uOU8y4JumlozWvBkwNQb/qWHqwvOVv2joYPtinngYm14Q2ByshQ6Brz7SXwWl7YLlk4Nj1NtWKMXCfWDbIKg0ss7r0nFGYjDeXe7vwXvNDoaq38Esv52fxBakVqlH1l8R24CIa5SHAtWW4qapGbb0/idUqGmOvCuqiiS6VeY9FW2TgqdxgNFRLK1djGo/hODFb+MqHMTTVrx58wzDTmEJmQYzIrClSFMrxQVPtyZMYAB68+GKdnhKOb8fgTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A5pVEnGVa68oseq/89PtwnnLremGLcB2D5ysV/SaJ8c=; b=RAotNlfcJtQkzqBjQGQ9nuoEjlWv9mdNuNTmnIy4IJVEHU4AYpL36sblkTJLfttk2IoPEIrDpBnA7/M6UfCOb5wcawTQqS8c8ltxZv++F6aXkmMV3bhqPHd827LSDwHGbAC7kaoRWdP5+PPPcf9dlasrTEmYOrAqLw8yvuHScGCc0WYNcX1wfVuDHrqyLXoXAn0n0oamMWnGB6ixkP1uzqB4ehJbBIodqW/Ly62HPlgFOopOG/uDSKxIxHzcK8KaW+RsThn2YuwdiXjG6Akd/HubTkCmJ84O4s25sf+GpHfDD9JqX81juRfJwtJVlKnAF+TUNLG2If+blzTLwxgI/A== Received: from MEYP282MB3302.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:15b::24) by MEYP282MB3121.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:160::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.19; Fri, 27 Aug 2021 10:30:02 +0000 Received: from MEYP282MB3302.AUSP282.PROD.OUTLOOK.COM ([fe80::6da0:5fb6:7e20:c7c6]) by MEYP282MB3302.AUSP282.PROD.OUTLOOK.COM ([fe80::6da0:5fb6:7e20:c7c6%5]) with mapi id 15.20.4436.027; Fri, 27 Aug 2021 10:30:02 +0000 From: lin huang To: "dev@openvswitch.org" , "dlu998@gmail.com" Thread-Topic: [PATCH] conntrack : dpif parameter is used, need to remove OVS_UNUSED. Thread-Index: AQHXmxaZzJXo1PyZrkq0EGe/5HhmzQ== Date: Fri, 27 Aug 2021 07:40:25 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [MicKo9+bCXSPeb2ZA2k+Ziq0LZtgrOjA] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5a4228c8-a9fc-470a-10bc-08d96945a0fa x-ms-traffictypediagnostic: MEYP282MB3121: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Dmz+VT7te+Z7tHm3T6TmBr9OhFObtDcUv7ZpSoUehBU28Xonibm8PRR5meVfFIEzF4QkZxe5DYkP0v3uP0+uHDyxb6Kpn1jvUZhf4hYMr/FnHc/O5mhk0kgvXRpGqIROHlT38hq1AgK6kluNF5OTzzsb4dO+qXE0Sm+KKMWTVpY2ekckCdDn8P3Gzijq8OjqHyJEN0QE0m6UKuYRBeVAo/aMmqjwrs0Zlbp0ZdIRw7xprLUi/ljA/5/sXPdEn3o35NN4Qyds/cGOrf2yHQ+vtqNL8j48t/00THlUYf7ChqjDVJV/NBY9OPu3Zya5Vl9ff9LRRBAQpk3wOPLPYD4kZAhuE7PkHaYaXsJoWFh1v7EWNgqxik5kjfU89akKuYEB+MUcFhFtNqP5cp+YgK5/DdxcT3rPEekqbtCLnmkM5fuPofsCjEL2JkPbuvW/lVGo x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: eF1QXKOTzulRVzhFvK0riFS4H+S5unZAwDosk9+ZA+qUG7WvtrP0nDSdX1t32T41p8iMbZb/ZnAbJ2f687hN18Tt8Ws4oFuqCJqO0ZRrww56GtIB2/25WtGD/MYAmpDdi6Oy5SyTwfOwMSqGkPAi2Q== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MEYP282MB3302.AUSP282.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 5a4228c8-a9fc-470a-10bc-08d96945a0fa X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2021 10:30:02.3451 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MEYP282MB3121 Subject: [ovs-dev] [PATCH] conntrack : dpif parameter is used, need to remove OVS_UNUSED. 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" The dpif parameter of zone limits function is used. We need to remove OVS_UNUSED flag. Signed-off-by: linhuang Reviewed-by: David Marchand --- lib/dpif-netdev.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -- 2.12.2 diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index b3e57bb95..1708a5f9e 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -8418,9 +8418,9 @@ dpif_netdev_ct_get_tcp_seq_chk(struct dpif *dpif, bool *enabled) } static int -dpif_netdev_ct_set_limits(struct dpif *dpif OVS_UNUSED, - const uint32_t *default_limits, - const struct ovs_list *zone_limits) +dpif_netdev_ct_set_limits(struct dpif *dpif, + const uint32_t *default_limits, + const struct ovs_list *zone_limits) { int err = 0; struct dp_netdev *dp = get_dp_netdev(dpif); @@ -8443,10 +8443,10 @@ dpif_netdev_ct_set_limits(struct dpif *dpif OVS_UNUSED, } static int -dpif_netdev_ct_get_limits(struct dpif *dpif OVS_UNUSED, - uint32_t *default_limit, - const struct ovs_list *zone_limits_request, - struct ovs_list *zone_limits_reply) +dpif_netdev_ct_get_limits(struct dpif *dpif, + uint32_t *default_limit, + const struct ovs_list *zone_limits_request, + struct ovs_list *zone_limits_reply) { struct dp_netdev *dp = get_dp_netdev(dpif); struct conntrack_zone_limit czl; @@ -8483,8 +8483,8 @@ dpif_netdev_ct_get_limits(struct dpif *dpif OVS_UNUSED, } static int -dpif_netdev_ct_del_limits(struct dpif *dpif OVS_UNUSED, - const struct ovs_list *zone_limits) +dpif_netdev_ct_del_limits(struct dpif *dpif, + const struct ovs_list *zone_limits) { int err = 0; struct dp_netdev *dp = get_dp_netdev(dpif);