Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/53574/?format=api
{ "id": 53574, "url": "http://patches.dpdk.org/api/patches/53574/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190521161315.25500-2-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": "<20190521161315.25500-2-olivier.matz@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190521161315.25500-2-olivier.matz@6wind.com", "date": "2019-05-21T16:13:01", "name": "[01/15] net: add rte prefix to arp structures", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "8c7909398ca301886588d8b60e7876b2ce103b75", "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/20190521161315.25500-2-olivier.matz@6wind.com/mbox/", "series": [ { "id": 4733, "url": "http://patches.dpdk.org/api/series/4733/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4733", "date": "2019-05-21T16:13:01", "name": "prefix network structures", "version": 1, "mbox": "http://patches.dpdk.org/series/4733/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/53574/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/53574/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 E95664CA7;\n\tTue, 21 May 2019 18:13:25 +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 719AF4C8B\n\tfor <dev@dpdk.org>; Tue, 21 May 2019 18:13:24 +0200 (CEST)", "from glumotte.dev.6wind.com. (unknown [10.16.0.195])\n\tby proxy.6wind.com (Postfix) with ESMTP id 4E4622B83D4;\n\tTue, 21 May 2019 18:13:24 +0200 (CEST)" ], "From": "Olivier Matz <olivier.matz@6wind.com>", "To": "dev@dpdk.org", "Cc": "stephen@networkplumber.org,\n\tferruh.yigit@intel.com", "Date": "Tue, 21 May 2019 18:13:01 +0200", "Message-Id": "<20190521161315.25500-2-olivier.matz@6wind.com>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": "<20190521161315.25500-1-olivier.matz@6wind.com>", "References": "<20190410083218.17531-1-olivier.matz@6wind.com>\n\t<20190521161315.25500-1-olivier.matz@6wind.com>", "Subject": "[dpdk-dev] [PATCH 01/15] net: add rte prefix to arp structures", "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": "Also rename arp_hrd, arp_pro, arp_hln, arp_pln and arp_op fields\nto avoid conflict with the #defines in gnu libc.\n\nSigned-off-by: Olivier Matz <olivier.matz@6wind.com>\n---\n app/test-pmd/icmpecho.c | 24 ++++++++++-----------\n app/test/packet_burst_generator.c | 12 +++++------\n app/test/packet_burst_generator.h | 2 +-\n app/test/test_link_bonding.c | 38 +++++++++++++++++++++-------------\n drivers/net/bonding/rte_eth_bond_alb.c | 26 +++++++++++------------\n drivers/net/bonding/rte_eth_bond_pmd.c | 10 +++++----\n drivers/net/i40e/i40e_fdir.c | 4 ++--\n examples/bond/main.c | 26 ++++++++++++-----------\n lib/librte_net/rte_arp.c | 14 ++++++-------\n lib/librte_net/rte_arp.h | 16 +++++++-------\n 10 files changed, 93 insertions(+), 79 deletions(-)", "diff": "diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c\nindex 55d266d77..0f92d14ad 100644\n--- a/app/test-pmd/icmpecho.c\n+++ b/app/test-pmd/icmpecho.c\n@@ -38,7 +38,7 @@\n static const char *\n arp_op_name(uint16_t arp_op)\n {\n-\tswitch (arp_op ) {\n+\tswitch (arp_op) {\n \tcase ARP_OP_REQUEST:\n \t\treturn \"ARP Request\";\n \tcase ARP_OP_REPLY:\n@@ -277,7 +277,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)\n \tstruct rte_mbuf *pkt;\n \tstruct ether_hdr *eth_h;\n \tstruct vlan_hdr *vlan_h;\n-\tstruct arp_hdr *arp_h;\n+\tstruct rte_arp_hdr *arp_h;\n \tstruct ipv4_hdr *ip_h;\n \tstruct icmp_hdr *icmp_h;\n \tstruct ether_addr eth_addr;\n@@ -347,22 +347,22 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)\n \n \t\t/* Reply to ARP requests */\n \t\tif (eth_type == ETHER_TYPE_ARP) {\n-\t\t\tarp_h = (struct arp_hdr *) ((char *)eth_h + l2_len);\n-\t\t\tarp_op = RTE_BE_TO_CPU_16(arp_h->arp_op);\n-\t\t\tarp_pro = RTE_BE_TO_CPU_16(arp_h->arp_pro);\n+\t\t\tarp_h = (struct rte_arp_hdr *) ((char *)eth_h + l2_len);\n+\t\t\tarp_op = RTE_BE_TO_CPU_16(arp_h->arp_opcode);\n+\t\t\tarp_pro = RTE_BE_TO_CPU_16(arp_h->arp_protocol);\n \t\t\tif (verbose_level > 0) {\n \t\t\t\tprintf(\" ARP: hrd=%d proto=0x%04x hln=%d \"\n \t\t\t\t \"pln=%d op=%u (%s)\\n\",\n-\t\t\t\t RTE_BE_TO_CPU_16(arp_h->arp_hrd),\n-\t\t\t\t arp_pro, arp_h->arp_hln,\n-\t\t\t\t arp_h->arp_pln, arp_op,\n+\t\t\t\t RTE_BE_TO_CPU_16(arp_h->arp_hardware),\n+\t\t\t\t arp_pro, arp_h->arp_hlen,\n+\t\t\t\t arp_h->arp_plen, arp_op,\n \t\t\t\t arp_op_name(arp_op));\n \t\t\t}\n-\t\t\tif ((RTE_BE_TO_CPU_16(arp_h->arp_hrd) !=\n+\t\t\tif ((RTE_BE_TO_CPU_16(arp_h->arp_hardware) !=\n \t\t\t ARP_HRD_ETHER) ||\n \t\t\t (arp_pro != ETHER_TYPE_IPv4) ||\n-\t\t\t (arp_h->arp_hln != 6) ||\n-\t\t\t (arp_h->arp_pln != 4)\n+\t\t\t (arp_h->arp_hlen != 6) ||\n+\t\t\t (arp_h->arp_plen != 4)\n \t\t\t ) {\n \t\t\t\trte_pktmbuf_free(pkt);\n \t\t\t\tif (verbose_level > 0)\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_op = rte_cpu_to_be_16(ARP_OP_REPLY);\n+\t\t\tarp_h->arp_opcode = rte_cpu_to_be_16(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 e894dc76f..0b12058bb 100644\n--- a/app/test/packet_burst_generator.c\n+++ b/app/test/packet_burst_generator.c\n@@ -74,15 +74,15 @@ initialize_eth_header(struct ether_hdr *eth_hdr, struct ether_addr *src_mac,\n }\n \n void\n-initialize_arp_header(struct arp_hdr *arp_hdr, struct ether_addr *src_mac,\n+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_hrd = rte_cpu_to_be_16(ARP_HRD_ETHER);\n-\tarp_hdr->arp_pro = rte_cpu_to_be_16(ETHER_TYPE_IPv4);\n-\tarp_hdr->arp_hln = ETHER_ADDR_LEN;\n-\tarp_hdr->arp_pln = sizeof(uint32_t);\n-\tarp_hdr->arp_op = rte_cpu_to_be_16(opcode);\n+\tarp_hdr->arp_hardware = rte_cpu_to_be_16(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(opcode);\n \tether_addr_copy(src_mac, &arp_hdr->arp_data.arp_sha);\n \tarp_hdr->arp_data.arp_sip = src_ip;\n \tether_addr_copy(dst_mac, &arp_hdr->arp_data.arp_tha);\ndiff --git a/app/test/packet_burst_generator.h b/app/test/packet_burst_generator.h\nindex c20cea6e9..b6e013a11 100644\n--- a/app/test/packet_burst_generator.h\n+++ b/app/test/packet_burst_generator.h\n@@ -29,7 +29,7 @@ initialize_eth_header(struct ether_hdr *eth_hdr, struct ether_addr *src_mac,\n \t\tuint8_t vlan_enabled, uint16_t van_id);\n \n void\n-initialize_arp_header(struct arp_hdr *arp_hdr, struct ether_addr *src_mac,\n+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 \ndiff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c\nindex 0438e76cc..6ff0f5b9c 100644\n--- a/app/test/test_link_bonding.c\n+++ b/app/test/test_link_bonding.c\n@@ -4469,7 +4469,7 @@ test_alb_change_mac_in_reply_sent(void)\n \tstruct rte_mbuf *pkts_sent[MAX_PKT_BURST];\n \n \tstruct ether_hdr *eth_pkt;\n-\tstruct arp_hdr *arp_pkt;\n+\tstruct rte_arp_hdr *arp_pkt;\n \n \tint slave_idx, nb_pkts, pkt_idx;\n \tint retval = 0;\n@@ -4504,7 +4504,8 @@ test_alb_change_mac_in_reply_sent(void)\n \teth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *);\n \tinitialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0,\n \t\t\t0);\n-\tarp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n+\tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt +\n+\t\t\t\t\tsizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &bond_mac, &client_mac, ip_host, ip_client1,\n \t\t\tARP_OP_REPLY);\n \trte_eth_tx_burst(test_params->bonded_port_id, 0, &pkt, 1);\n@@ -4514,7 +4515,8 @@ test_alb_change_mac_in_reply_sent(void)\n \teth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *);\n \tinitialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0,\n \t\t\t0);\n-\tarp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n+\tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt +\n+\t\t\t\t\tsizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &bond_mac, &client_mac, ip_host, ip_client2,\n \t\t\tARP_OP_REPLY);\n \trte_eth_tx_burst(test_params->bonded_port_id, 0, &pkt, 1);\n@@ -4524,7 +4526,8 @@ test_alb_change_mac_in_reply_sent(void)\n \teth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *);\n \tinitialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0,\n \t\t\t0);\n-\tarp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n+\tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt +\n+\t\t\t\t\tsizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &bond_mac, &client_mac, ip_host, ip_client3,\n \t\t\tARP_OP_REPLY);\n \trte_eth_tx_burst(test_params->bonded_port_id, 0, &pkt, 1);\n@@ -4534,7 +4537,8 @@ test_alb_change_mac_in_reply_sent(void)\n \teth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *);\n \tinitialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0,\n \t\t\t0);\n-\tarp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n+\tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt +\n+\t\t\t\t\tsizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &bond_mac, &client_mac, ip_host, ip_client4,\n \t\t\tARP_OP_REPLY);\n \trte_eth_tx_burst(test_params->bonded_port_id, 0, &pkt, 1);\n@@ -4555,7 +4559,8 @@ test_alb_change_mac_in_reply_sent(void)\n \n \t\tfor (pkt_idx = 0; pkt_idx < nb_pkts; pkt_idx++) {\n \t\t\teth_pkt = rte_pktmbuf_mtod(pkts_sent[pkt_idx], struct ether_hdr *);\n-\t\t\tarp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n+\t\t\tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt +\n+\t\t\t\t\t\tsizeof(struct ether_hdr));\n \n \t\t\tif (slave_idx%2 == 0) {\n \t\t\t\tif (!is_same_ether_addr(slave_mac1, &arp_pkt->arp_data.arp_sha)) {\n@@ -4580,7 +4585,7 @@ static int\n test_alb_reply_from_client(void)\n {\n \tstruct ether_hdr *eth_pkt;\n-\tstruct arp_hdr *arp_pkt;\n+\tstruct rte_arp_hdr *arp_pkt;\n \n \tstruct rte_mbuf *pkt;\n \tstruct rte_mbuf *pkts_sent[MAX_PKT_BURST];\n@@ -4617,7 +4622,8 @@ test_alb_reply_from_client(void)\n \teth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *);\n \tinitialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0,\n \t\t\t0);\n-\tarp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n+\tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt +\n+\t\t\t\t\tsizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client1, ip_host,\n \t\t\tARP_OP_REPLY);\n \tvirtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt,\n@@ -4628,7 +4634,8 @@ test_alb_reply_from_client(void)\n \teth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *);\n \tinitialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0,\n \t\t\t0);\n-\tarp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n+\tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt +\n+\t\t\t\t\tsizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client2, ip_host,\n \t\t\tARP_OP_REPLY);\n \tvirtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt,\n@@ -4639,7 +4646,8 @@ test_alb_reply_from_client(void)\n \teth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *);\n \tinitialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0,\n \t\t\t0);\n-\tarp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n+\tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt +\n+\t\t\t\t\tsizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client3, ip_host,\n \t\t\tARP_OP_REPLY);\n \tvirtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt,\n@@ -4650,7 +4658,8 @@ test_alb_reply_from_client(void)\n \teth_pkt = rte_pktmbuf_mtod(pkt, struct ether_hdr *);\n \tinitialize_eth_header(eth_pkt, &bond_mac, &client_mac, ETHER_TYPE_ARP, 0,\n \t\t\t0);\n-\tarp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n+\tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt +\n+\t\t\t\t\tsizeof(struct ether_hdr));\n \tinitialize_arp_header(arp_pkt, &client_mac, &bond_mac, ip_client4, ip_host,\n \t\t\tARP_OP_REPLY);\n \tvirtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt,\n@@ -4676,7 +4685,8 @@ test_alb_reply_from_client(void)\n \n \t\tfor (pkt_idx = 0; pkt_idx < nb_pkts; pkt_idx++) {\n \t\t\teth_pkt = rte_pktmbuf_mtod(pkts_sent[pkt_idx], struct ether_hdr *);\n-\t\t\tarp_pkt = (struct arp_hdr *)((char *)eth_pkt + sizeof(struct ether_hdr));\n+\t\t\tarp_pkt = (struct rte_arp_hdr *)((char *)eth_pkt +\n+\t\t\t\t\t\tsizeof(struct ether_hdr));\n \n \t\t\tif (slave_idx%2 == 0) {\n \t\t\t\tif (!is_same_ether_addr(slave_mac1, &arp_pkt->arp_data.arp_sha)) {\n@@ -4708,7 +4718,7 @@ test_alb_receive_vlan_reply(void)\n {\n \tstruct ether_hdr *eth_pkt;\n \tstruct vlan_hdr *vlan_pkt;\n-\tstruct arp_hdr *arp_pkt;\n+\tstruct rte_arp_hdr *arp_pkt;\n \n \tstruct rte_mbuf *pkt;\n \tstruct rte_mbuf *pkts_sent[MAX_PKT_BURST];\n@@ -4749,7 +4759,7 @@ test_alb_receive_vlan_reply(void)\n \tvlan_pkt = vlan_pkt+1;\n \tvlan_pkt->vlan_tci = rte_cpu_to_be_16(2);\n \tvlan_pkt->eth_proto = rte_cpu_to_be_16(ETHER_TYPE_ARP);\n-\tarp_pkt = (struct arp_hdr *)((char *)(vlan_pkt + 1));\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 \tvirtual_ethdev_add_mbufs_to_rx_queue(test_params->slave_port_ids[0], &pkt,\ndiff --git a/drivers/net/bonding/rte_eth_bond_alb.c b/drivers/net/bonding/rte_eth_bond_alb.c\nindex d3e16d4bd..703223937 100644\n--- a/drivers/net/bonding/rte_eth_bond_alb.c\n+++ b/drivers/net/bonding/rte_eth_bond_alb.c\n@@ -74,17 +74,17 @@ bond_mode_alb_enable(struct rte_eth_dev *bond_dev)\n \n void bond_mode_alb_arp_recv(struct ether_hdr *eth_h, uint16_t offset,\n \t\tstruct bond_dev_private *internals) {\n-\tstruct arp_hdr *arp;\n+\tstruct rte_arp_hdr *arp;\n \n \tstruct client_data *hash_table = internals->mode6.client_table;\n \tstruct client_data *client_info;\n \n \tuint8_t hash_index;\n \n-\tarp = (struct arp_hdr *) ((char *) (eth_h + 1) + 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_op != rte_cpu_to_be_16(ARP_OP_REPLY))\n+\tif (arp->arp_opcode != rte_cpu_to_be_16(ARP_OP_REPLY))\n \t\treturn;\n \n \t/* From now on, we analyze only ARP Reply packets */\n@@ -123,7 +123,7 @@ uint16_t\n bond_mode_alb_arp_xmit(struct ether_hdr *eth_h, uint16_t offset,\n \t\tstruct bond_dev_private *internals)\n {\n-\tstruct arp_hdr *arp;\n+\tstruct rte_arp_hdr *arp;\n \n \tstruct client_data *hash_table = internals->mode6.client_table;\n \tstruct client_data *client_info;\n@@ -132,7 +132,7 @@ bond_mode_alb_arp_xmit(struct ether_hdr *eth_h, uint16_t offset,\n \n \tstruct ether_addr bonding_mac;\n \n-\tarp = (struct arp_hdr *)((char *)(eth_h + 1) + offset);\n+\tarp = (struct rte_arp_hdr *)((char *)(eth_h + 1) + offset);\n \n \t/*\n \t * Traffic with src MAC other than bonding should be sent on\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_op == rte_cpu_to_be_16(ARP_OP_REPLY)) {\n+\tif (arp->arp_opcode == rte_cpu_to_be_16(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@@ -196,7 +196,7 @@ bond_mode_alb_arp_upd(struct client_data *client_info,\n \t\tstruct rte_mbuf *pkt, struct bond_dev_private *internals)\n {\n \tstruct ether_hdr *eth_h;\n-\tstruct arp_hdr *arp_h;\n+\tstruct rte_arp_hdr *arp_h;\n \tuint16_t slave_idx;\n \n \trte_spinlock_lock(&internals->mode6.lock);\n@@ -209,7 +209,7 @@ bond_mode_alb_arp_upd(struct client_data *client_info,\n \telse\n \t\teth_h->ether_type = rte_cpu_to_be_16(ETHER_TYPE_ARP);\n \n-\tarp_h = (struct arp_hdr *)((char *)eth_h + sizeof(struct ether_hdr)\n+\tarp_h = (struct rte_arp_hdr *)((char *)eth_h + sizeof(struct ether_hdr)\n \t\t\t+ client_info->vlan_count * sizeof(struct vlan_hdr));\n \n \tmemcpy(eth_h + 1, client_info->vlan,\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_hrd = rte_cpu_to_be_16(ARP_HRD_ETHER);\n-\tarp_h->arp_pro = rte_cpu_to_be_16(ETHER_TYPE_IPv4);\n-\tarp_h->arp_hln = ETHER_ADDR_LEN;\n-\tarp_h->arp_pln = sizeof(uint32_t);\n-\tarp_h->arp_op = rte_cpu_to_be_16(ARP_OP_REPLY);\n+\tarp_h->arp_hardware = rte_cpu_to_be_16(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 \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 2c4da90c6..fa8f81e2b 100644\n--- a/drivers/net/bonding/rte_eth_bond_pmd.c\n+++ b/drivers/net/bonding/rte_eth_bond_pmd.c\n@@ -589,7 +589,7 @@ mode6_debug(const char __attribute__((unused)) *info, struct ether_hdr *eth_h,\n {\n \tstruct ipv4_hdr *ipv4_h;\n #ifdef RTE_LIBRTE_BOND_DEBUG_ALB\n-\tstruct arp_hdr *arp_h;\n+\tstruct rte_arp_hdr *arp_h;\n \tchar dst_ip[16];\n \tchar ArpOp[24];\n \tchar buf[16];\n@@ -614,7 +614,7 @@ mode6_debug(const char __attribute__((unused)) *info, struct ether_hdr *eth_h,\n \t}\n #ifdef RTE_LIBRTE_BOND_DEBUG_ALB\n \telse if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_ARP)) {\n-\t\tarp_h = (struct arp_hdr *)((char *)(eth_h + 1) + offset);\n+\t\tarp_h = (struct rte_arp_hdr *)((char *)(eth_h + 1) + offset);\n \t\tipv4_addr_to_dot(arp_h->arp_data.arp_sip, src_ip, MaxIPv4String);\n \t\tipv4_addr_to_dot(arp_h->arp_data.arp_tip, dst_ip, MaxIPv4String);\n \t\tarp_op_name(rte_be_to_cpu_16(arp_h->arp_op),\n@@ -1132,8 +1132,10 @@ bond_ethdev_tx_burst_alb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t\t\t\t \"Failed to allocate ARP packet from pool\");\n \t\t\t\t\tcontinue;\n \t\t\t\t}\n-\t\t\t\tpkt_size = sizeof(struct ether_hdr) + sizeof(struct arp_hdr)\n-\t\t\t\t\t\t+ client_info->vlan_count * sizeof(struct vlan_hdr);\n+\t\t\t\tpkt_size = sizeof(struct ether_hdr) +\n+\t\t\t\t\tsizeof(struct rte_arp_hdr) +\n+\t\t\t\t\tclient_info->vlan_count *\n+\t\t\t\t\tsizeof(struct vlan_hdr);\n \t\t\t\tupd_pkt->data_len = pkt_size;\n \t\t\t\tupd_pkt->pkt_len = pkt_size;\n \ndiff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c\nindex d41601a17..4b32fee1e 100644\n--- a/drivers/net/i40e/i40e_fdir.c\n+++ b/drivers/net/i40e/i40e_fdir.c\n@@ -911,7 +911,7 @@ i40e_fdir_construct_pkt(struct i40e_pf *pf,\n \t\t */\n \t\tif (fdir_input->flow.l2_flow.ether_type ==\n \t\t\t\trte_cpu_to_be_16(ETHER_TYPE_ARP))\n-\t\t\tpayload += sizeof(struct arp_hdr);\n+\t\t\tpayload += sizeof(struct rte_arp_hdr);\n \t\tset_idx = I40E_FLXPLD_L2_IDX;\n \t\tbreak;\n \tdefault:\n@@ -1197,7 +1197,7 @@ i40e_flow_fdir_construct_pkt(struct i40e_pf *pf,\n \t\t */\n \t\tif (fdir_input->flow.l2_flow.ether_type ==\n \t\t\t\trte_cpu_to_be_16(ETHER_TYPE_ARP))\n-\t\t\tpayload += sizeof(struct arp_hdr);\n+\t\t\tpayload += sizeof(struct rte_arp_hdr);\n \t\tset_idx = I40E_FLXPLD_L2_IDX;\n \t} else if (fdir_input->flow_ext.customized_pctype) {\n \t\t/* If customized pctype is used */\ndiff --git a/examples/bond/main.c b/examples/bond/main.c\nindex ef86194ff..24479649e 100644\n--- a/examples/bond/main.c\n+++ b/examples/bond/main.c\n@@ -339,7 +339,7 @@ static int lcore_main(__attribute__((unused)) void *arg1)\n \tstruct ether_addr d_addr;\n \n \tstruct ether_hdr *eth_hdr;\n-\tstruct arp_hdr *arp_hdr;\n+\tstruct rte_arp_hdr *arp_hdr;\n \tstruct ipv4_hdr *ipv4_hdr;\n \tuint16_t ether_type, offset;\n \n@@ -382,10 +382,11 @@ static int lcore_main(__attribute__((unused)) void *arg1)\n \t\t\t\t\tglobal_flag_stru_p->port_packets[1]++;\n \t\t\t\t\trte_spinlock_unlock(&global_flag_stru_p->lock);\n \t\t\t\t}\n-\t\t\t\tarp_hdr = (struct arp_hdr *)((char *)(eth_hdr + 1) + offset);\n+\t\t\t\tarp_hdr = (struct rte_arp_hdr *)(\n+\t\t\t\t\t(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_op == rte_cpu_to_be_16(ARP_OP_REQUEST)) {\n-\t\t\t\t\t\tarp_hdr->arp_op = rte_cpu_to_be_16(ARP_OP_REPLY);\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\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@@ -450,7 +451,7 @@ static void cmd_obj_send_parsed(void *parsed_result,\n \n \tstruct rte_mbuf *created_pkt;\n \tstruct ether_hdr *eth_hdr;\n-\tstruct arp_hdr *arp_hdr;\n+\tstruct rte_arp_hdr *arp_hdr;\n \n \tuint32_t bond_ip;\n \tsize_t pkt_size;\n@@ -469,7 +470,7 @@ static void cmd_obj_send_parsed(void *parsed_result,\n \t\treturn;\n \t}\n \n-\tpkt_size = sizeof(struct ether_hdr) + sizeof(struct arp_hdr);\n+\tpkt_size = sizeof(struct ether_hdr) + sizeof(struct rte_arp_hdr);\n \tcreated_pkt->data_len = pkt_size;\n \tcreated_pkt->pkt_len = pkt_size;\n \n@@ -478,12 +479,13 @@ static void cmd_obj_send_parsed(void *parsed_result,\n \tmemset(ð_hdr->d_addr, 0xFF, ETHER_ADDR_LEN);\n \teth_hdr->ether_type = rte_cpu_to_be_16(ETHER_TYPE_ARP);\n \n-\tarp_hdr = (struct arp_hdr *)((char *)eth_hdr + sizeof(struct ether_hdr));\n-\tarp_hdr->arp_hrd = rte_cpu_to_be_16(ARP_HRD_ETHER);\n-\tarp_hdr->arp_pro = rte_cpu_to_be_16(ETHER_TYPE_IPv4);\n-\tarp_hdr->arp_hln = ETHER_ADDR_LEN;\n-\tarp_hdr->arp_pln = sizeof(uint32_t);\n-\tarp_hdr->arp_op = rte_cpu_to_be_16(ARP_OP_REQUEST);\n+\tarp_hdr = (struct rte_arp_hdr *)(\n+\t\t(char *)eth_hdr + sizeof(struct ether_hdr));\n+\tarp_hdr->arp_hardware = rte_cpu_to_be_16(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 \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 f0ed9bd68..c80ebc7e1 100644\n--- a/lib/librte_net/rte_arp.c\n+++ b/lib/librte_net/rte_arp.c\n@@ -12,7 +12,7 @@ rte_net_make_rarp_packet(struct rte_mempool *mpool,\n \t\tconst struct ether_addr *mac)\n {\n \tstruct ether_hdr *eth_hdr;\n-\tstruct arp_hdr *rarp;\n+\tstruct rte_arp_hdr *rarp;\n \tstruct rte_mbuf *mbuf;\n \n \tif (mpool == NULL)\n@@ -34,12 +34,12 @@ rte_net_make_rarp_packet(struct rte_mempool *mpool,\n \teth_hdr->ether_type = htons(ETHER_TYPE_RARP);\n \n \t/* RARP header. */\n-\trarp = (struct arp_hdr *)(eth_hdr + 1);\n-\trarp->arp_hrd = htons(ARP_HRD_ETHER);\n-\trarp->arp_pro = htons(ETHER_TYPE_IPv4);\n-\trarp->arp_hln = ETHER_ADDR_LEN;\n-\trarp->arp_pln = 4;\n-\trarp->arp_op = htons(ARP_OP_REVREQUEST);\n+\trarp = (struct rte_arp_hdr *)(eth_hdr + 1);\n+\trarp->arp_hardware = htons(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 \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 139a84ca5..c9b5cd49d 100644\n--- a/lib/librte_net/rte_arp.h\n+++ b/lib/librte_net/rte_arp.h\n@@ -21,7 +21,7 @@ extern \"C\" {\n /**\n * ARP header IPv4 payload.\n */\n-struct arp_ipv4 {\n+struct rte_arp_ipv4 {\n \tstruct ether_addr arp_sha; /**< sender hardware address */\n \tuint32_t arp_sip; /**< sender IP address */\n \tstruct ether_addr arp_tha; /**< target hardware address */\n@@ -31,14 +31,14 @@ struct arp_ipv4 {\n /**\n * ARP header.\n */\n-struct arp_hdr {\n-\tuint16_t arp_hrd; /* format of hardware address */\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 \n-\tuint16_t arp_pro; /* format of protocol address */\n-\tuint8_t arp_hln; /* length of hardware address */\n-\tuint8_t arp_pln; /* length of protocol address */\n-\tuint16_t arp_op; /* ARP opcode (command) */\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@@ -46,7 +46,7 @@ struct arp_hdr {\n #define\tARP_OP_INVREQUEST 8 /* request to identify peer */\n #define\tARP_OP_INVREPLY 9 /* response identifying peer */\n \n-\tstruct arp_ipv4 arp_data;\n+\tstruct rte_arp_ipv4 arp_data;\n } __attribute__((__packed__));\n \n /**\n", "prefixes": [ "01/15" ] }