[dpdk-stable] patch 'net: define IPv4 IHL and VHL' has been queued to LTS release 18.11.3

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/03/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/e63b7033e41f7cf5e462a8301ca84b2ba9c30fd4

Thanks.

Kevin Traynor

---
From e63b7033e41f7cf5e462a8301ca84b2ba9c30fd4 Mon Sep 17 00:00:00 2001
From: Saleh Alsouqi <salehals@mellanox.com>
Date: Thu, 4 Jul 2019 07:33:19 +0000
Subject: [PATCH] net: define IPv4 IHL and VHL

[ upstream commit 2318d8d5456532e8022d324937a77a416b701d2b ]

Define IPv4 Minimum IHL and VHL according to rfc791 (see [1])

    "The Version field indicates the format of the
    internet header."

    "Internet Header Length (ihl) is the length of the
    internet header in 32 bit words, and thus points
    to the beginning of the data. Note that
    the minimum value for a correct header is 5."

[1] https://tools.ietf.org/html/rfc791

Signed-off-by: Saleh Alsouqi <salehals@mellanox.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 lib/librte_net/rte_ip.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index 3cf3081e4..7639164c2 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -17,5 +17,7 @@
 
 #include <stdint.h>
+#include <sys/types.h>
 #include <netinet/in.h>
+#include <netinet/ip.h>
 
 #include <rte_byteorder.h>
@@ -90,4 +92,8 @@ struct ipv4_hdr {
 	((x) >= IPV4_MIN_MCAST && (x) <= IPV4_MAX_MCAST) /**< check if IPv4 address is multicast */
 
+/* IPv4 default fields values */
+#define IPV4_MIN_IHL    (0x5)
+#define IPV4_VHL_DEF    (IPVERSION | IPV4_MIN_IHL)
+
 /**
  * @internal Calculate a sum of all words in the buffer.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.293303742 +0100
+++ 0007-net-define-IPv4-IHL-and-VHL.patch	2019-08-27 09:40:10.849146112 +0100
@@ -1 +1 @@
-From 2318d8d5456532e8022d324937a77a416b701d2b Mon Sep 17 00:00:00 2001
+From e63b7033e41f7cf5e462a8301ca84b2ba9c30fd4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2318d8d5456532e8022d324937a77a416b701d2b ]
+
@@ -25 +27 @@
-index e69b86353..26b089ec1 100644
+index 3cf3081e4..7639164c2 100644
@@ -36,2 +38,2 @@
-@@ -97,4 +99,8 @@ struct rte_ipv4_hdr {
- 	/**< check if IPv4 address is multicast */
+@@ -90,4 +92,8 @@ struct ipv4_hdr {
+ 	((x) >= IPV4_MIN_MCAST && (x) <= IPV4_MAX_MCAST) /**< check if IPv4 address is multicast */
@@ -40,2 +42,2 @@
-+#define RTE_IPV4_MIN_IHL    (0x5)
-+#define RTE_IPV4_VHL_DEF    (IPVERSION | RTE_IPV4_MIN_IHL)
++#define IPV4_MIN_IHL    (0x5)
++#define IPV4_VHL_DEF    (IPVERSION | IPV4_MIN_IHL)