net: replace IPv4/v6 constants with uppercase name

[dpdk.git] / lib / librte_vhost / virtio_net.c

diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index 1f55553..bd6635c 100644 (file)
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -218,11 +218,11 @@ virtio_enqueue_offload(struct rte_mbuf *m_buf, struct virtio_net_hdr *net_hdr)
 
                switch (csum_l4) {
                case PKT_TX_TCP_CKSUM:
-                       net_hdr->csum_offset = (offsetof(struct tcp_hdr,
+                       net_hdr->csum_offset = (offsetof(struct rte_tcp_hdr,
                                                cksum));
                        break;
                case PKT_TX_UDP_CKSUM:
-                       net_hdr->csum_offset = (offsetof(struct udp_hdr,
+                       net_hdr->csum_offset = (offsetof(struct rte_udp_hdr,
                                                dgram_cksum));
                        break;
                case PKT_TX_SCTP_CKSUM:
@@ -988,14 +988,14 @@ parse_ethernet(struct rte_mbuf *m, uint16_t *l4_proto, void **l4_hdr)
        l3_hdr = (char *)eth_hdr + m->l2_len;
 
        switch (ethertype) {
-       case RTE_ETHER_TYPE_IPv4:
+       case RTE_ETHER_TYPE_IPV4:
                ipv4_hdr = l3_hdr;
                *l4_proto = ipv4_hdr->next_proto_id;
                m->l3_len = (ipv4_hdr->version_ihl & 0x0f) * 4;
                *l4_hdr = (char *)l3_hdr + m->l3_len;
                m->ol_flags |= PKT_TX_IPV4;
                break;
-       case RTE_ETHER_TYPE_IPv6:
+       case RTE_ETHER_TYPE_IPV6:
                ipv6_hdr = l3_hdr;
                *l4_proto = ipv6_hdr->proto;
                m->l3_len = sizeof(struct rte_ipv6_hdr);
@@ -1015,7 +1015,7 @@ vhost_dequeue_offload(struct virtio_net_hdr *hdr, struct rte_mbuf *m)
 {
        uint16_t l4_proto = 0;
        void *l4_hdr = NULL;
-       struct tcp_hdr *tcp_hdr = NULL;
+       struct rte_tcp_hdr *tcp_hdr = NULL;
 
        if (hdr->flags == 0 && hdr->gso_type == VIRTIO_NET_HDR_GSO_NONE)
                return;
@@ -1024,11 +1024,11 @@ vhost_dequeue_offload(struct virtio_net_hdr *hdr, struct rte_mbuf *m)
        if (hdr->flags == VIRTIO_NET_HDR_F_NEEDS_CSUM) {
                if (hdr->csum_start == (m->l2_len + m->l3_len)) {
                        switch (hdr->csum_offset) {
-                       case (offsetof(struct tcp_hdr, cksum)):
+                       case (offsetof(struct rte_tcp_hdr, cksum)):
                                if (l4_proto == IPPROTO_TCP)
                                        m->ol_flags |= PKT_TX_TCP_CKSUM;
                                break;
-                       case (offsetof(struct udp_hdr, dgram_cksum)):
+                       case (offsetof(struct rte_udp_hdr, dgram_cksum)):
                                if (l4_proto == IPPROTO_UDP)
                                        m->ol_flags |= PKT_TX_UDP_CKSUM;
                                break;
@@ -1054,7 +1054,7 @@ vhost_dequeue_offload(struct virtio_net_hdr *hdr, struct rte_mbuf *m)
                case VIRTIO_NET_HDR_GSO_UDP:
                        m->ol_flags |= PKT_TX_UDP_SEG;
                        m->tso_segsz = hdr->gso_size;
-                       m->l4_len = sizeof(struct udp_hdr);
+                       m->l4_len = sizeof(struct rte_udp_hdr);
                        break;
                default:
                        RTE_LOG(WARNING, VHOST_DATA,