X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Ftep_termination%2Fvxlan_setup.c;h=9a0880002ad74ea4269789b71bf2a9ef60e95369;hb=abff4333ec20b3fd6cd998523382956881bac842;hp=e4af7bc4d950b73d49876a1963c5e9d6e0760e7f;hpb=6d13ea8e8e49ab957deae2bba5ecf4a4bfe747d1;p=dpdk.git

diff --git a/examples/tep_termination/vxlan_setup.c b/examples/tep_termination/vxlan_setup.c
index e4af7bc4d9..9a0880002a 100644
--- a/examples/tep_termination/vxlan_setup.c
+++ b/examples/tep_termination/vxlan_setup.c
@@ -48,7 +48,7 @@
 /* VXLAN device */
 struct vxlan_conf vxdev;
 
-struct ipv4_hdr app_ip_hdr[VXLAN_N_PORTS];
+struct rte_ipv4_hdr app_ip_hdr[VXLAN_N_PORTS];
 struct rte_ether_hdr app_l2_hdr[VXLAN_N_PORTS];
 
 /* local VTEP IP address */
@@ -229,7 +229,7 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m)
 	int i, ret;
 	struct rte_ether_hdr *pkt_hdr;
 	uint64_t portid = vdev->vid;
-	struct ipv4_hdr *ip;
+	struct rte_ipv4_hdr *ip;
 
 	struct rte_eth_tunnel_filter_conf tunnel_filter_conf;
 
@@ -243,7 +243,7 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m)
 
 	/* Learn MAC address of guest device from packet */
 	pkt_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
-	if (is_same_ether_addr(&(pkt_hdr->s_addr), &vdev->mac_address)) {
+	if (rte_is_same_ether_addr(&(pkt_hdr->s_addr), &vdev->mac_address)) {
 		RTE_LOG(INFO, VHOST_DATA,
 			"(%d) WARNING: This device is using an existing"
 			" MAC address and has not been registered.\n",
@@ -251,7 +251,7 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m)
 		return -1;
 	}
 
-	for (i = 0; i < ETHER_ADDR_LEN; i++) {
+	for (i = 0; i < RTE_ETHER_ADDR_LEN; i++) {
 		vdev->mac_address.addr_bytes[i] =
 			vxdev.port[portid].vport_mac.addr_bytes[i] =
 			pkt_hdr->s_addr.addr_bytes[i];
@@ -261,11 +261,11 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m)
 	memset(&tunnel_filter_conf, 0,
 		sizeof(struct rte_eth_tunnel_filter_conf));
 
-	ether_addr_copy(&ports_eth_addr[0], &tunnel_filter_conf.outer_mac);
+	rte_ether_addr_copy(&ports_eth_addr[0], &tunnel_filter_conf.outer_mac);
 	tunnel_filter_conf.filter_type = tep_filter_type[filter_idx];
 
 	/* inner MAC */
-	ether_addr_copy(&vdev->mac_address, &tunnel_filter_conf.inner_mac);
+	rte_ether_addr_copy(&vdev->mac_address, &tunnel_filter_conf.inner_mac);
 
 	tunnel_filter_conf.queue_id = vdev->rx_q;
 	tunnel_filter_conf.tenant_id = tenant_id_conf[vdev->rx_q];
@@ -309,11 +309,11 @@ vxlan_link(struct vhost_dev *vdev, struct rte_mbuf *m)
 	}
 
 	vxdev.out_key = tenant_id_conf[vdev->rx_q];
-	ether_addr_copy(&vxdev.port[portid].peer_mac,
+	rte_ether_addr_copy(&vxdev.port[portid].peer_mac,
 			&app_l2_hdr[portid].d_addr);
-	ether_addr_copy(&ports_eth_addr[0],
+	rte_ether_addr_copy(&ports_eth_addr[0],
 			&app_l2_hdr[portid].s_addr);
-	app_l2_hdr[portid].ether_type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
+	app_l2_hdr[portid].ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4);
 
 	ip = &app_ip_hdr[portid];
 	ip->version_ihl = IP_VHL_DEF;
@@ -349,8 +349,10 @@ vxlan_unlink(struct vhost_dev *vdev)
 		memset(&tunnel_filter_conf, 0,
 			sizeof(struct rte_eth_tunnel_filter_conf));
 
-		ether_addr_copy(&ports_eth_addr[0], &tunnel_filter_conf.outer_mac);
-		ether_addr_copy(&vdev->mac_address, &tunnel_filter_conf.inner_mac);
+		rte_ether_addr_copy(&ports_eth_addr[0],
+				&tunnel_filter_conf.outer_mac);
+		rte_ether_addr_copy(&vdev->mac_address,
+				&tunnel_filter_conf.inner_mac);
 		tunnel_filter_conf.tenant_id = tenant_id_conf[vdev->rx_q];
 		tunnel_filter_conf.filter_type = tep_filter_type[filter_idx];
 
@@ -371,7 +373,7 @@ vxlan_unlink(struct vhost_dev *vdev)
 				vdev->rx_q);
 			return;
 		}
-		for (i = 0; i < ETHER_ADDR_LEN; i++)
+		for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
 			vdev->mac_address.addr_bytes[i] = 0;
 
 		/* Clear out the receive buffers */