From: Konstantin Ananyev <konstantin.ananyev@intel.com>
Date: Thu, 18 Jul 2019 10:11:13 +0000 (+0100)
Subject: examples/ip_frag: fix unknown ethernet type
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=826038fcfc7b82866673f10e22cc89860ca4cba3;p=dpdk.git

examples/ip_frag: fix unknown ethernet type

Right now app blindly set IPv4 ether type for all non IPv6 packets.
Instead we can save and later restore original type value.

Fixes: 74de12b7b63a ("examples/ip_fragmentation: overhaul")
Cc: stable@dpdk.org

Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---

diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index d03e93c901..edf87a1a11 100644
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -242,18 +242,21 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
 {
 	struct rx_queue *rxq;
 	uint32_t i, len, next_hop;
-	uint8_t ipv6;
-	uint16_t port_out;
+	uint16_t port_out, ether_type;
 	int32_t len2;
 	uint64_t ol_flags;
+	const struct rte_ether_hdr *eth;
 
-	ipv6 = 0;
 	ol_flags = 0;
 	rxq = &qconf->rx_queue_list[queueid];
 
 	/* by default, send everything back to the source port */
 	port_out = port_in;
 
+	/* save ether type of the incoming packet */
+	eth = rte_pktmbuf_mtod(m, const struct rte_ether_hdr *);
+	ether_type = eth->ether_type;
+
 	/* Remove the Ethernet header and trailer from the input packet */
 	rte_pktmbuf_adj(m, (uint16_t)sizeof(struct rte_ether_hdr));
 
@@ -302,8 +305,6 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
 		/* if this is an IPv6 packet */
 		struct rte_ipv6_hdr *ip_hdr;
 
-		ipv6 = 1;
-
 		/* Read the lookup key (i.e. ip_dst) from the input packet */
 		ip_hdr = rte_pktmbuf_mtod(m, struct rte_ipv6_hdr *);
 
@@ -364,13 +365,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
 		/* src addr */
 		rte_ether_addr_copy(&ports_eth_addr[port_out],
 				&eth_hdr->s_addr);
-		if (ipv6) {
-			eth_hdr->ether_type =
-				rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV6);
-		} else {
-			eth_hdr->ether_type =
-				rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4);
-		}
+		eth_hdr->ether_type = ether_type;
 	}
 
 	len += len2;