Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/52544/?format=api
{ "id": 52544, "url": "http://patches.dpdk.org/api/patches/52544/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190410083218.17531-3-olivier.matz@6wind.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20190410083218.17531-3-olivier.matz@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190410083218.17531-3-olivier.matz@6wind.com", "date": "2019-04-10T08:32:06", "name": "[RFC,v2,02/14] net: add rte prefix to arp defines", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6e9ab3b84397f17bdc0bcc79fa95039b4368ba7c", "submitter": { "id": 8, "url": "http://patches.dpdk.org/api/people/8/?format=api", "name": "Olivier Matz", "email": "olivier.matz@6wind.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190410083218.17531-3-olivier.matz@6wind.com/mbox/", "series": [ { "id": 4226, "url": "http://patches.dpdk.org/api/series/4226/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4226", "date": "2019-04-10T08:32:06", "name": "prefix network structures", "version": 2, "mbox": "http://patches.dpdk.org/series/4226/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/52544/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/52544/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 3D4FE4D3A;\n\tWed, 10 Apr 2019 10:32:31 +0200 (CEST)", "from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com\n\t[62.23.145.76]) by dpdk.org (Postfix) with ESMTP id 648674D27\n\tfor <dev@dpdk.org>; Wed, 10 Apr 2019 10:32:29 +0200 (CEST)", "from glumotte.dev.6wind.com. (unknown [10.16.0.195])\n\tby proxy.6wind.com (Postfix) with ESMTP id 41672295E66;\n\tWed, 10 Apr 2019 10:32:29 +0200 (CEST)" ], "From": "Olivier Matz <olivier.matz@6wind.com>", "To": "dev@dpdk.org", "Cc": "Ferruh Yigit <ferruh.yigit@intel.com>", "Date": "Wed, 10 Apr 2019 10:32:06 +0200", "Message-Id": "<20190410083218.17531-3-olivier.matz@6wind.com>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": "<20190410083218.17531-1-olivier.matz@6wind.com>", "References": "<20181024081833.21432-1-olivier.matz@6wind.com>\n\t<20190410083218.17531-1-olivier.matz@6wind.com>", "Subject": "[dpdk-dev] [RFC v2 02/14] net: add rte prefix to arp defines", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add 'RTE_' prefix to defines:\n- rename ARP_HRD_ETHER as RTE_ARP_HRD_ETHER.\n- rename ARP_OP_REQUEST as RTE_ARP_OP_REQUEST.\n- rename ARP_OP_REPLY as RTE_ARP_OP_REPLY.\n- rename ARP_OP_REVREQUEST as RTE_ARP_OP_REVREQUEST.\n- rename ARP_OP_REVREPLY as RTE_ARP_OP_REVREPLY.\n- rename ARP_OP_INVREQUEST as RTE_ARP_OP_INVREQUEST.\n- rename ARP_OP_INVREPLY as RTE_ARP_OP_INVREPLY.\n\nSigned-off-by: Olivier Matz <olivier.matz@6wind.com>\n---\n app/test-pmd/icmpecho.c | 18 +++++++++---------\n app/test/packet_burst_generator.c | 2 +-\n app/test/test_link_bonding.c | 18 +++++++++---------\n drivers/net/bonding/rte_eth_bond_alb.c | 8 ++++----\n drivers/net/bonding/rte_eth_bond_pmd.c | 12 ++++++------\n examples/bond/main.c | 8 ++++----\n lib/librte_net/rte_arp.c | 4 ++--\n lib/librte_net/rte_arp.h | 14 +++++++-------\n 8 files changed, 42 insertions(+), 42 deletions(-)", "diff": "diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c\nindex 34f68d73b..062e3ea43 100644\n--- a/app/test-pmd/icmpecho.c\n+++ b/app/test-pmd/icmpecho.c\n@@ -39,17 +39,17 @@ static const char *\n arp_opcode_name(uint16_t arp_opcode)\n {\n \tswitch (arp_opcode ) {\n-\tcase ARP_OP_REQUEST:\n+\tcase RTE_ARP_OP_REQUEST:\n \t\treturn \"ARP Request\";\n-\tcase ARP_OP_REPLY:\n+\tcase RTE_ARP_OP_REPLY:\n \t\treturn \"ARP Reply\";\n-\tcase ARP_OP_REVREQUEST:\n+\tcase RTE_ARP_OP_REVREQUEST:\n \t\treturn \"Reverse ARP Request\";\n-\tcase ARP_OP_REVREPLY:\n+\tcase RTE_ARP_OP_REVREPLY:\n \t\treturn \"Reverse ARP Reply\";\n-\tcase ARP_OP_INVREQUEST:\n+\tcase RTE_ARP_OP_INVREQUEST:\n \t\treturn \"Peer Identify Request\";\n-\tcase ARP_OP_INVREPLY:\n+\tcase RTE_ARP_OP_INVREPLY:\n \t\treturn \"Peer Identify Reply\";\n \tdefault:\n \t\tbreak;\n@@ -359,7 +359,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)\n \t\t\t\t arp_opcode_name(arp_opcode));\n \t\t\t}\n \t\t\tif ((RTE_BE_TO_CPU_16(arp_h->arp_hardware) !=\n-\t\t\t ARP_HRD_ETHER) ||\n+\t\t\t RTE_ARP_HRD_ETHER) ||\n \t\t\t (arp_protocol != ETHER_TYPE_IPv4) ||\n \t\t\t (arp_h->arp_hlen != 6) ||\n \t\t\t (arp_h->arp_plen != 4)\n@@ -381,7 +381,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)\n \t\t\t\tipv4_addr_dump(\" tip=\", ip_addr);\n \t\t\t\tprintf(\"\\n\");\n \t\t\t}\n-\t\t\tif (arp_opcode != ARP_OP_REQUEST) {\n+\t\t\tif (arp_opcode != RTE_ARP_OP_REQUEST) {\n \t\t\t\trte_pktmbuf_free(pkt);\n \t\t\t\tcontinue;\n \t\t\t}\n@@ -396,7 +396,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)\n \t\t\tether_addr_copy(&ports[fs->tx_port].eth_addr,\n \t\t\t\t\tð_h->s_addr);\n \n-\t\t\tarp_h->arp_opcode = rte_cpu_to_be_16(ARP_OP_REPLY);\n+\t\t\tarp_h->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REPLY);\n \t\t\tether_addr_copy(&arp_h->arp_data.arp_tha, ð_addr);\n \t\t\tether_addr_copy(&arp_h->arp_data.arp_sha, &arp_h->arp_data.arp_tha);\n \t\t\tether_addr_copy(ð_h->s_addr, &arp_h->arp_data.arp_sha);\ndiff --git a/app/test/packet_burst_generator.c b/app/test/packet_burst_generator.c\nindex 0b12058bb..ccc0bd591 100644\n--- a/app/test/packet_burst_generator.c\n+++ b/app/test/packet_burst_generator.c\n@@ -78,7 +78,7 @@ initialize_arp_header(struct rte_arp_hdr *arp_hdr, struct ether_addr *src_mac,\n \t\tstruct ether_addr *dst_mac, uint32_t src_ip, uint32_t dst_ip,\n \t\tuint32_t opcode)\n {\n-\tarp_hdr->arp_hardware = rte_cpu_to_be_16(ARP_HRD_ETHER);\n+\tarp_hdr->arp_hardware = rte_cpu_to_be_16(RTE_ARP_HRD_ETHER);\n \tarp_hdr->arp_protocol = rte_cpu_to_be_16(ETHER_TYPE_IPv4);\n \tarp_hdr->arp_hlen = ETHER_ADDR_LEN;\n \tarp_hdr->arp_plen = sizeof(uint32_t);\ndiff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c\nindex db437a9c2..2c20f44ea 100644\n--- a/app/test/test_link_bonding.c\n+++ b/app/test/test_link_bonding.c\n@@ -4497,7 +4497,7 @@ test_alb_change_mac_in_reply_sent(void)\n \t\t\t0);\n \tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &bond_mac, &client_mac, ip_host, ip_client1,\n-\t\t\tARP_OP_REPLY);\n+\t\t\tRTE_ARP_OP_REPLY);\n \trte_eth_tx_burst(test_params->bonded_port_id, 0, &pkt, 1);\n \n \tpkt = rte_pktmbuf_alloc(test_params->mbuf_pool);\n@@ -4507,7 +4507,7 @@ test_alb_change_mac_in_reply_sent(void)\n \t\t\t0);\n \tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &bond_mac, &client_mac, ip_host, ip_client2,\n-\t\t\tARP_OP_REPLY);\n+\t\t\tRTE_ARP_OP_REPLY);\n \trte_eth_tx_burst(test_params->bonded_port_id, 0, &pkt, 1);\n \n \tpkt = rte_pktmbuf_alloc(test_params->mbuf_pool);\n@@ -4517,7 +4517,7 @@ test_alb_change_mac_in_reply_sent(void)\n \t\t\t0);\n \tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &bond_mac, &client_mac, ip_host, ip_client3,\n-\t\t\tARP_OP_REPLY);\n+\t\t\tRTE_ARP_OP_REPLY);\n \trte_eth_tx_burst(test_params->bonded_port_id, 0, &pkt, 1);\n \n \tpkt = rte_pktmbuf_alloc(test_params->mbuf_pool);\n@@ -4527,7 +4527,7 @@ test_alb_change_mac_in_reply_sent(void)\n \t\t\t0);\n \tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &bond_mac, &client_mac, ip_host, ip_client4,\n-\t\t\tARP_OP_REPLY);\n+\t\t\tRTE_ARP_OP_REPLY);\n \trte_eth_tx_burst(test_params->bonded_port_id, 0, &pkt, 1);\n \n \tslave_mac1 =\n@@ -4610,7 +4610,7 @@ test_alb_reply_from_client(void)\n \t\t\t0);\n \tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client1, ip_host,\n-\t\t\tARP_OP_REPLY);\n+\t\t\tRTE_ARP_OP_REPLY);\n \tvirtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt,\n \t\t\t1);\n \n@@ -4621,7 +4621,7 @@ test_alb_reply_from_client(void)\n \t\t\t0);\n \tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client2, ip_host,\n-\t\t\tARP_OP_REPLY);\n+\t\t\tRTE_ARP_OP_REPLY);\n \tvirtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt,\n \t\t\t1);\n \n@@ -4632,7 +4632,7 @@ test_alb_reply_from_client(void)\n \t\t\t0);\n \tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client3, ip_host,\n-\t\t\tARP_OP_REPLY);\n+\t\t\tRTE_ARP_OP_REPLY);\n \tvirtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt,\n \t\t\t1);\n \n@@ -4643,7 +4643,7 @@ test_alb_reply_from_client(void)\n \t\t\t0);\n \tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client4, ip_host,\n-\t\t\tARP_OP_REPLY);\n+\t\t\tRTE_ARP_OP_REPLY);\n \tvirtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt,\n \t\t\t1);\n \n@@ -4742,7 +4742,7 @@ test_alb_receive_vlan_reply(void)\n \tvlan_pkt->eth_proto = rte_cpu_to_be_16(ETHER_TYPE_ARP);\n \tarp_pkt = (struct rte_arp_hdr *)((char *)(vlan_pkt + 1));\n \tinitialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client1, ip_host,\n-\t\t\tARP_OP_REPLY);\n+\t\t\tRTE_ARP_OP_REPLY);\n \tvirtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt,\n \t\t\t1);\n \ndiff --git a/drivers/net/bonding/rte_eth_bond_alb.c b/drivers/net/bonding/rte_eth_bond_alb.c\nindex 16a415a99..3df28965c 100644\n--- a/drivers/net/bonding/rte_eth_bond_alb.c\n+++ b/drivers/net/bonding/rte_eth_bond_alb.c\n@@ -84,7 +84,7 @@ void bond_mode_alb_arp_recv(struct ether_hdr *eth_h, uint16_t offset,\n \tarp = (struct rte_arp_hdr *) ((char *) (eth_h + 1) + offset);\n \n \t/* ARP Requests are forwarded to the application with no changes */\n-\tif (arp->arp_opcode != rte_cpu_to_be_16(ARP_OP_REPLY))\n+\tif (arp->arp_opcode != rte_cpu_to_be_16(RTE_ARP_OP_REPLY))\n \t\treturn;\n \n \t/* From now on, we analyze only ARP Reply packets */\n@@ -150,7 +150,7 @@ bond_mode_alb_arp_xmit(struct ether_hdr *eth_h, uint16_t offset,\n \tclient_info = &hash_table[hash_index];\n \n \trte_spinlock_lock(&internals->mode6.lock);\n-\tif (arp->arp_opcode == rte_cpu_to_be_16(ARP_OP_REPLY)) {\n+\tif (arp->arp_opcode == rte_cpu_to_be_16(RTE_ARP_OP_REPLY)) {\n \t\tif (client_info->in_use) {\n \t\t\tif (client_info->app_ip == arp->arp_data.arp_sip &&\n \t\t\t\tclient_info->cli_ip == arp->arp_data.arp_tip) {\n@@ -220,11 +220,11 @@ bond_mode_alb_arp_upd(struct client_data *client_info,\n \tether_addr_copy(&client_info->cli_mac, &arp_h->arp_data.arp_tha);\n \tarp_h->arp_data.arp_tip = client_info->cli_ip;\n \n-\tarp_h->arp_hardware = rte_cpu_to_be_16(ARP_HRD_ETHER);\n+\tarp_h->arp_hardware = rte_cpu_to_be_16(RTE_ARP_HRD_ETHER);\n \tarp_h->arp_protocol = rte_cpu_to_be_16(ETHER_TYPE_IPv4);\n \tarp_h->arp_hlen = ETHER_ADDR_LEN;\n \tarp_h->arp_plen = sizeof(uint32_t);\n-\tarp_h->arp_opcode = rte_cpu_to_be_16(ARP_OP_REPLY);\n+\tarp_h->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REPLY);\n \n \tslave_idx = client_info->slave_idx;\n \trte_spinlock_unlock(&internals->mode6.lock);\ndiff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c\nindex 9c5425ef5..63df3568d 100644\n--- a/drivers/net/bonding/rte_eth_bond_pmd.c\n+++ b/drivers/net/bonding/rte_eth_bond_pmd.c\n@@ -492,22 +492,22 @@ static void\n arp_opcode_name(uint16_t arp_opcode, char *buf, size_t buf_len)\n {\n \tswitch (arp_opcode) {\n-\tcase ARP_OP_REQUEST:\n+\tcase RTE_ARP_OP_REQUEST:\n \t\tstrlcpy(buf, \"ARP Request\", buf_len);\n \t\treturn;\n-\tcase ARP_OP_REPLY:\n+\tcase RTE_ARP_OP_REPLY:\n \t\tstrlcpy(buf, \"ARP Reply\", buf_len);\n \t\treturn;\n-\tcase ARP_OP_REVREQUEST:\n+\tcase RTE_ARP_OP_REVREQUEST:\n \t\tstrlcpy(buf, \"Reverse ARP Request\", buf_len);\n \t\treturn;\n-\tcase ARP_OP_REVREPLY:\n+\tcase RTE_ARP_OP_REVREPLY:\n \t\tstrlcpy(buf, \"Reverse ARP Reply\", buf_len);\n \t\treturn;\n-\tcase ARP_OP_INVREQUEST:\n+\tcase RTE_ARP_OP_INVREQUEST:\n \t\tstrlcpy(buf, \"Peer Identify Request\", buf_len);\n \t\treturn;\n-\tcase ARP_OP_INVREPLY:\n+\tcase RTE_ARP_OP_INVREPLY:\n \t\tstrlcpy(buf, \"Peer Identify Reply\", buf_len);\n \t\treturn;\n \tdefault:\ndiff --git a/examples/bond/main.c b/examples/bond/main.c\nindex 4ad62c3cb..cf7335ddf 100644\n--- a/examples/bond/main.c\n+++ b/examples/bond/main.c\n@@ -384,8 +384,8 @@ static int lcore_main(__attribute__((unused)) void *arg1)\n \t\t\t\t}\n \t\t\t\tarp_hdr = (struct rte_arp_hdr *)((char *)(eth_hdr + 1) + offset);\n \t\t\t\tif (arp_hdr->arp_data.arp_tip == bond_ip) {\n-\t\t\t\t\tif (arp_hdr->arp_opcode == rte_cpu_to_be_16(ARP_OP_REQUEST)) {\n-\t\t\t\t\t\tarp_hdr->arp_opcode = rte_cpu_to_be_16(ARP_OP_REPLY);\n+\t\t\t\t\tif (arp_hdr->arp_opcode == rte_cpu_to_be_16(RTE_ARP_OP_REQUEST)) {\n+\t\t\t\t\t\tarp_hdr->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REPLY);\n \t\t\t\t\t\t/* Switch src and dst data and set bonding MAC */\n \t\t\t\t\t\tether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr);\n \t\t\t\t\t\trte_eth_macaddr_get(BOND_PORT, ð_hdr->s_addr);\n@@ -479,11 +479,11 @@ static void cmd_obj_send_parsed(void *parsed_result,\n \teth_hdr->ether_type = rte_cpu_to_be_16(ETHER_TYPE_ARP);\n \n \tarp_hdr = (struct rte_arp_hdr *)((char *)eth_hdr + sizeof(struct ether_hdr));\n-\tarp_hdr->arp_hardware = rte_cpu_to_be_16(ARP_HRD_ETHER);\n+\tarp_hdr->arp_hardware = rte_cpu_to_be_16(RTE_ARP_HRD_ETHER);\n \tarp_hdr->arp_protocol = rte_cpu_to_be_16(ETHER_TYPE_IPv4);\n \tarp_hdr->arp_hlen = ETHER_ADDR_LEN;\n \tarp_hdr->arp_plen = sizeof(uint32_t);\n-\tarp_hdr->arp_opcode = rte_cpu_to_be_16(ARP_OP_REQUEST);\n+\tarp_hdr->arp_opcode = rte_cpu_to_be_16(RTE_ARP_OP_REQUEST);\n \n \trte_eth_macaddr_get(BOND_PORT, &arp_hdr->arp_data.arp_sha);\n \tarp_hdr->arp_data.arp_sip = bond_ip;\ndiff --git a/lib/librte_net/rte_arp.c b/lib/librte_net/rte_arp.c\nindex c80ebc7e1..877874a5e 100644\n--- a/lib/librte_net/rte_arp.c\n+++ b/lib/librte_net/rte_arp.c\n@@ -35,11 +35,11 @@ rte_net_make_rarp_packet(struct rte_mempool *mpool,\n \n \t/* RARP header. */\n \trarp = (struct rte_arp_hdr *)(eth_hdr + 1);\n-\trarp->arp_hardware = htons(ARP_HRD_ETHER);\n+\trarp->arp_hardware = htons(RTE_ARP_HRD_ETHER);\n \trarp->arp_protocol = htons(ETHER_TYPE_IPv4);\n \trarp->arp_hlen = ETHER_ADDR_LEN;\n \trarp->arp_plen = 4;\n-\trarp->arp_opcode = htons(ARP_OP_REVREQUEST);\n+\trarp->arp_opcode = htons(RTE_ARP_OP_REVREQUEST);\n \n \tether_addr_copy(mac, &rarp->arp_data.arp_sha);\n \tether_addr_copy(mac, &rarp->arp_data.arp_tha);\ndiff --git a/lib/librte_net/rte_arp.h b/lib/librte_net/rte_arp.h\nindex c9b5cd49d..a94fa6a00 100644\n--- a/lib/librte_net/rte_arp.h\n+++ b/lib/librte_net/rte_arp.h\n@@ -33,18 +33,18 @@ struct rte_arp_ipv4 {\n */\n struct rte_arp_hdr {\n \tuint16_t arp_hardware; /* format of hardware address */\n-#define ARP_HRD_ETHER 1 /* ARP Ethernet address format */\n+#define RTE_ARP_HRD_ETHER 1 /* ARP Ethernet address format */\n \n \tuint16_t arp_protocol; /* format of protocol address */\n \tuint8_t arp_hlen; /* length of hardware address */\n \tuint8_t arp_plen; /* length of protocol address */\n \tuint16_t arp_opcode; /* ARP opcode (command) */\n-#define\tARP_OP_REQUEST 1 /* request to resolve address */\n-#define\tARP_OP_REPLY 2 /* response to previous request */\n-#define\tARP_OP_REVREQUEST 3 /* request proto addr given hardware */\n-#define\tARP_OP_REVREPLY 4 /* response giving protocol address */\n-#define\tARP_OP_INVREQUEST 8 /* request to identify peer */\n-#define\tARP_OP_INVREPLY 9 /* response identifying peer */\n+#define\tRTE_ARP_OP_REQUEST 1 /* request to resolve address */\n+#define\tRTE_ARP_OP_REPLY 2 /* response to previous request */\n+#define\tRTE_ARP_OP_REVREQUEST 3 /* request proto addr given hardware */\n+#define\tRTE_ARP_OP_REVREPLY 4 /* response giving protocol address */\n+#define\tRTE_ARP_OP_INVREQUEST 8 /* request to identify peer */\n+#define\tRTE_ARP_OP_INVREPLY 9 /* response identifying peer */\n \n \tstruct rte_arp_ipv4 arp_data;\n } __attribute__((__packed__));\n", "prefixes": [ "RFC", "v2", "02/14" ] }