From patchwork Fri Aug 11 22:22:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 130236 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 66CB043038; Sat, 12 Aug 2023 00:25:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D29E432B7; Sat, 12 Aug 2023 00:23:29 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 820ED43262 for ; Sat, 12 Aug 2023 00:23:04 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 4211320FD40D; Fri, 11 Aug 2023 15:23:02 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4211320FD40D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1691792583; bh=fTY6sQOeQ6Ua/IHrWZ+8y/SY87OWiqDoTQY3AZ40zM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=onOlBJ4zIauDj/bV+fATaDomfDAECn0OK5m4XFVxEf6fBsj2dTfH/0r7KSC46dyiC 2algfOGtXS7OpyaVtr+d83vF6xrphFleFrcMGY15NJnZefQgn91fp21KA5i4+XsAIK znb2PgxDYON4KfEFrYWJ4tXTQkaU+MMy5O5JpHow= From: Tyler Retzlaff To: dev@dpdk.org Cc: Akhil Goyal , Anatoly Burakov , Andrew Rybchenko , Bruce Richardson , Chengwen Feng , Cristian Dumitrescu , David Hunt , Erik Gabriel Carrillo , Fan Zhang , Ferruh Yigit , Harman Kalra , Hemant Agrawal , Honnappa Nagarahalli , Jerin Jacob , Junfeng Guo , Kevin Laatz , Kiran Kumar K , Konstantin Ananyev , Matan Azrad , Matt Peters , Naga Harish K S V , Nithin Dabilpuram , Olivier Matz , Ori Kam , Radu Nicolau , Sachin Saxena , Sameh Gobriel , Satha Rao , Simei Su , Srikanth Yalavarthi , Steven Webster , Suanming Mou , Sunil Kumar Kori , Thomas Monjalon , Viacheslav Ovsiienko , Vladimir Medvedkin , Yipeng Wang , Zhirun Yan , Tyler Retzlaff Subject: [PATCH 18/32] ethdev: remove use of RTE STD C11 macro Date: Fri, 11 Aug 2023 15:22:33 -0700 Message-Id: <1691792567-10805-19-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1691792567-10805-1-git-send-email-roretzla@linux.microsoft.com> References: <1691792567-10805-1-git-send-email-roretzla@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org C11 conformant compiler is documented as a minimum requirement to build and consume DPDK. Remove use of RTE_STD_C11 macro marking use of C11 features with __extension__ since it is no longer necessary. Signed-off-by: Tyler Retzlaff --- lib/ethdev/rte_flow.h | 11 ----------- lib/ethdev/rte_mtr.h | 1 - lib/ethdev/rte_tm.h | 3 --- 3 files changed, 15 deletions(-) diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index 86ed98c..2ebb76d 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -726,7 +726,6 @@ struct rte_flow_item_quota { * RTE_FLOW_ITEM_TYPE_HIGIG2 * Matches higig2 header */ -RTE_STD_C11 struct rte_flow_item_higig2_hdr { struct rte_higig2_hdr hdr; }; @@ -848,7 +847,6 @@ struct rte_flow_item_raw { * the EtherType/TPID field. Also, it's possible to leave the two fields unused. * If this is the case, both tagged and untagged packets will match the pattern. */ -RTE_STD_C11 struct rte_flow_item_eth { union { struct { @@ -890,7 +888,6 @@ struct rte_flow_item_eth { * If the @p eth_proto of @p hdr and @p has_more_vlan fields are not specified, * then any tagged packets will match the pattern. */ -RTE_STD_C11 struct rte_flow_item_vlan { union { struct { @@ -1075,7 +1072,6 @@ struct rte_flow_item_sctp { * * Matches a VXLAN header (RFC 7348). */ -RTE_STD_C11 struct rte_flow_item_vxlan { union { struct { @@ -1246,7 +1242,6 @@ struct rte_flow_item_fuzzy { * * Matches a GTPv1 header. */ -RTE_STD_C11 struct rte_flow_item_gtp { union { struct { @@ -1322,7 +1317,6 @@ struct rte_flow_item_geneve { * * Matches a VXLAN-GPE header. */ -RTE_STD_C11 struct rte_flow_item_vxlan_gpe { union { struct { @@ -1352,7 +1346,6 @@ struct rte_flow_item_vxlan_gpe { * * Matches an ARP header for Ethernet/IPv4. */ -RTE_STD_C11 struct rte_flow_item_arp_eth_ipv4 { union { struct { @@ -1874,7 +1867,6 @@ struct rte_flow_item_integrity { * @see rte_flow_action_rss */ uint32_t level; - RTE_STD_C11 union { __extension__ struct { @@ -3893,7 +3885,6 @@ enum rte_flow_field_id { */ struct rte_flow_action_modify_data { enum rte_flow_field_id field; /**< Field or memory type ID. */ - RTE_STD_C11 union { struct { /** Encapsulation level and tag index or flex item handle. */ @@ -4200,7 +4191,6 @@ struct rte_flow_error { * @see RTE_FLOW_CONV_OP_RULE * @see rte_flow_conv() */ -RTE_STD_C11 struct rte_flow_conv_rule { union { const struct rte_flow_attr *attr_ro; /**< RO attributes. */ @@ -5002,7 +4992,6 @@ struct rte_flow_tunnel { enum rte_flow_item_type type; uint64_t tun_id; /**< Tunnel identification. */ - RTE_STD_C11 union { struct { rte_be32_t src_addr; /**< IPv4 source address. */ diff --git a/lib/ethdev/rte_mtr.h b/lib/ethdev/rte_mtr.h index 7e6a66b..30e6c6b 100644 --- a/lib/ethdev/rte_mtr.h +++ b/lib/ethdev/rte_mtr.h @@ -129,7 +129,6 @@ struct rte_mtr_meter_profile { /** Traffic metering algorithm. */ enum rte_mtr_algorithm alg; - RTE_STD_C11 union { /** Items only valid when *alg* is set to srTCM - RFC 2697. */ struct { diff --git a/lib/ethdev/rte_tm.h b/lib/ethdev/rte_tm.h index 4103c49..08c5faf 100644 --- a/lib/ethdev/rte_tm.h +++ b/lib/ethdev/rte_tm.h @@ -500,7 +500,6 @@ struct rte_tm_level_capabilities { */ int leaf_nodes_identical; - RTE_STD_C11 union { /** Items valid only for the non-leaf nodes on this level. */ struct { @@ -851,7 +850,6 @@ struct rte_tm_node_capabilities { */ int shaper_shared_byte_mode_supported; - RTE_STD_C11 union { /** Items valid only for non-leaf nodes. */ struct { @@ -1108,7 +1106,6 @@ struct rte_tm_node_params { /** Number of shared shaper IDs in the *shared_shaper_id* array. */ uint32_t n_shared_shapers; - RTE_STD_C11 union { /** Parameters only valid for non-leaf nodes. */ struct {