From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BAC4EA0613 for ; Fri, 27 Sep 2019 13:54:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AFBB61BEE4; Fri, 27 Sep 2019 13:54:02 +0200 (CEST) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id A0E001BEFB for ; Fri, 27 Sep 2019 13:54:00 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id u20so1005192plq.4 for ; Fri, 27 Sep 2019 04:54:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=z4JA1QntaryP8bq5odIvRYvjWNPKPZHDbl4so0ft9W0=; b=PT3M2o47SarURwenk8rcMiZL3f9QVj67qoHJGNxYWSx39nITI7VL/8osZ0wjIjayy7 4pLVr3tK6Os4bPIv8yDoJV4zgz+zEjVxtzKhv6Yf1Mzg5wAA1GB10wXT4oJ0AHM363jH 6Y81ygdkNM0UMmc59ahoEzHRBzsmX4PI9Jl+AvImnL7Dobbrz8c0kD5h6fQaxfcFcCfE KOtRKpNEwN8lW/eopgyr6kCB6swq39J4Rei8q1lghItmm4UEeRHa2hDewVNDT+gMCus+ mkNF6Bl0DLdGwGROTT9o259De7WlB3nCqrLZNAldF7J0RE5lLViughQr2JJJLS65MWVu Vi2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=z4JA1QntaryP8bq5odIvRYvjWNPKPZHDbl4so0ft9W0=; b=uPJorkZE2qcufyFNRXxVrdnBRPJpG+yZMdS1xuYDNcdu/BKTD5Ubpp5U+pSlnZ+N3S QAmRNyDZmBPXTBi7MiRILLctZDoQEVnfgkvLIH+JT/msBaSnoKyNItp3b7NdeYmyyvwF F/4gfUT8g7n0QEKDAanws2FcdNPzX0Tk0y2ahnD/jZzmeCxwm88w2qUSdFm8gDNT7y3H 7OqONdJZgY/O1h2BSGmNz+XghB8srqNMx+w1972Q5WqVyooKfntZfkl0n9yjH3z4ONV0 cIn6IOfp4snQ4r78MqTunJwCFZOyLto4Dsd5MhZiYkaK5z5pEH2XEd0iJYB0UKyGgUEa 0sMQ== X-Gm-Message-State: APjAAAVIDtoKXTMsf1m8Q5LA0fgE++692HbWo647I+m3OVHA6fF6hgcl Rfnxh7rZ5RbxaDOmvqGc67Rn1ex8 X-Google-Smtp-Source: APXvYqyeROyAQg5+eD3JMbLQZalLHdHNn/GNbtGuNQrgolFSskrnJMv4z1plwsMY2ohMoMJwCkpYaQ== X-Received: by 2002:a17:902:8601:: with SMTP id f1mr4093252plo.180.1569585239555; Fri, 27 Sep 2019 04:53:59 -0700 (PDT) Received: from localhost.localdomain ([2400:4050:c8c2:de00:1cd5:c7a9:dd6b:86d2]) by smtp.gmail.com with ESMTPSA id 37sm5117291pgv.32.2019.09.27.04.53.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 04:53:59 -0700 (PDT) From: Yasufumi Ogawa To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Fri, 27 Sep 2019 20:53:49 +0900 Message-Id: <20190927115349.13081-4-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190927115349.13081-1-yasufum.o@gmail.com> References: <20190927115349.13081-1-yasufum.o@gmail.com> Subject: [spp] [PATCH 3/3] spp_vf: add rte prefix for DPDK v19.08 X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spp-bounces@dpdk.org Sender: "spp" As previous patch, this update is to follow DPDK v19.08. Signed-off-by: Yasufumi Ogawa --- src/vf/classifier.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/vf/classifier.c b/src/vf/classifier.c index fa47ed7..8a4c8fc 100644 --- a/src/vf/classifier.c +++ b/src/vf/classifier.c @@ -114,7 +114,7 @@ static const size_t HASH_TABLE_NAME_BUF_SZ = /* MAC address string(xx:xx:xx:xx:xx:xx) buffer size */ static const size_t ETHER_ADDR_STR_BUF_SZ = - ETHER_ADDR_LEN * 2 + (ETHER_ADDR_LEN - 1) + 1; + RTE_ETHER_ADDR_LEN * 2 + (RTE_ETHER_ADDR_LEN - 1) + 1; /** * Hash table count used for making a name of hash table. @@ -128,13 +128,13 @@ static rte_atomic16_t g_hash_table_count = RTE_ATOMIC16_INIT(0xff); static inline uint16_t get_vid(const struct rte_mbuf *pkt) { - struct ether_hdr *eth; - struct vlan_hdr *vh; + struct rte_ether_hdr *eth; + struct rte_vlan_hdr *vh; - eth = rte_pktmbuf_mtod(pkt, struct ether_hdr *); - if (eth->ether_type == rte_cpu_to_be_16(ETHER_TYPE_VLAN)) { + eth = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + if (eth->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN)) { /* vlan tagged */ - vh = (struct vlan_hdr *)(eth + 1); + vh = (struct rte_vlan_hdr *)(eth + 1); return rte_be_to_cpu_16(vh->vlan_tci) & 0x0fff; } @@ -152,11 +152,11 @@ static void log_packet(const char *name, struct rte_mbuf *pkt, const char *func_name, int line_num) { - struct ether_hdr *eth; + struct rte_ether_hdr *eth; uint16_t vid; char mac_addr_str[2][ETHER_ADDR_STR_BUF_SZ]; - eth = rte_pktmbuf_mtod(pkt, struct ether_hdr *); + eth = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); vid = get_vid(pkt); ether_format_addr(mac_addr_str[0], sizeof(mac_addr_str), @@ -181,12 +181,12 @@ log_classification(long clsd_idx, struct rte_mbuf *pkt, struct cls_port_info *clsd_data, const char *func_name, int line_num) { - struct ether_hdr *eth; + struct rte_ether_hdr *eth; uint16_t vid; char mac_addr_str[2][ETHER_ADDR_STR_BUF_SZ]; char iface_str[STR_LEN_NAME]; - eth = rte_pktmbuf_mtod(pkt, struct ether_hdr *); + eth = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); vid = get_vid(pkt); ether_format_addr(mac_addr_str[0], sizeof(mac_addr_str), @@ -281,7 +281,7 @@ create_mac_classification(void) struct rte_hash_parameters hash_params = { .name = hash_tab_name, .entries = NOF_CLS_TABLE_ENTRIES, - .key_len = sizeof(struct ether_addr), + .key_len = sizeof(struct rte_ether_addr), .hash_func = DEFAULT_HASH_FUNC, .hash_func_init_val = 0, .socket_id = rte_socket_id(), @@ -308,7 +308,7 @@ init_component_info(struct cls_comp_info *cmp_info, int ret = SPPWK_RET_NG; int i; struct mac_classifier *mac_cls; - struct ether_addr eth_addr; + struct rte_ether_addr eth_addr; char mac_addr_str[ETHER_ADDR_STR_BUF_SZ]; /* Classifier has one RX port and several TX ports. */ struct cls_port_info *cls_rx_port_info = &cmp_info->rx_port_i; @@ -384,8 +384,8 @@ init_component_info(struct cls_comp_info *cmp_info, /* Add entry to classifier table. */ rte_memcpy(ð_addr, &tx_port->cls_attrs.mac_addr, - ETHER_ADDR_LEN); - ether_format_addr(mac_addr_str, sizeof(mac_addr_str), + RTE_ETHER_ADDR_LEN); + rte_ether_format_addr(mac_addr_str, sizeof(mac_addr_str), ð_addr); ret = rte_hash_add_key_data(mac_cls->cls_tbl, @@ -552,12 +552,12 @@ select_classified_index(const struct rte_mbuf *pkt, struct cls_comp_info *cmp_info) { int ret; - struct ether_hdr *eth; + struct rte_ether_hdr *eth; void *lookup_data; struct mac_classifier *mac_cls; uint16_t vid; - eth = rte_pktmbuf_mtod(pkt, struct ether_hdr *); + eth = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); vid = get_vid(pkt); /* select mac address classification by vid */ @@ -582,7 +582,7 @@ select_classified_index(const struct rte_mbuf *pkt, "(EINVAL=%d, ENOENT=%d)\n", ret, EINVAL, ENOENT); /* check if packet is l2 multicast */ - if (unlikely(is_multicast_ether_addr(ð->d_addr))) + if (unlikely(rte_is_multicast_ether_addr(ð->d_addr))) return -2; /* if default is not set, use untagged's default */ @@ -858,8 +858,8 @@ add_mac_entry(struct classifier_table_params *params, if (unlikely(ret < 0)) break; - ether_format_addr(mac_addr_str, sizeof(mac_addr_str), - (const struct ether_addr *)key); + rte_ether_format_addr(mac_addr_str, sizeof(mac_addr_str), + (const struct rte_ether_addr *)key); port.iface_type = (port_info + (long)data)->iface_type; port.iface_no = (port_info + (long)data)->iface_no_global; -- 2.17.1