1 files changed, 0 insertions, 83 deletions
diff --git a/dpdk/dpdk-16.04_patches/0004-mbuf-rearrange-rte_mbuf-metadata-to-suit-vpp.patch b/dpdk/dpdk-16.04_patches/0004-mbuf-rearrange-rte_mbuf-metadata-to-suit-vpp.patch
deleted file mode 100644
index 78d0c637562..00000000000
--- a/dpdk/dpdk-16.04_patches/0004-mbuf-rearrange-rte_mbuf-metadata-to-suit-vpp.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From eed80f56477e26a5711ea3749d1881797b3c82a5 Mon Sep 17 00:00:00 2001
-From: Damjan Marion <damarion@cisco.com>
-Date: Wed, 16 Dec 2015 04:25:23 +0100
-Subject: [PATCH 4/6] mbuf: rearrange rte_mbuf metadata to suit vpp
-
----
- .../linuxapp/eal/include/exec-env/rte_kni_common.h   |  5 +++--
- lib/librte_mbuf/rte_mbuf.h                           | 20 ++++++++++++--------
- 2 files changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
-index 7e5e598..fdbeb4a 100644
---- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
-+++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
-@@ -118,11 +118,12 @@ struct rte_kni_mbuf {
- 	char pad2[4];
- 	uint32_t pkt_len;       /**< Total pkt len: sum of all segment data_len. */
- 	uint16_t data_len;      /**< Amount of data in segment buffer. */
-+	char pad3[8];
-+	void *next;
- 
- 	/* fields on second cache line */
--	char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_MIN_SIZE)));
-+	char pad4[16] __attribute__((__aligned__(RTE_CACHE_LINE_MIN_SIZE)));
- 	void *pool;
--	void *next;
- };
- 
- /*
-diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
-index 75a227d..ca4d0fb 100644
---- a/lib/librte_mbuf/rte_mbuf.h
-+++ b/lib/librte_mbuf/rte_mbuf.h
-@@ -731,6 +731,12 @@ typedef uint64_t MARKER64[0]; /**< marker that allows us to overwrite 8 bytes
- /**
-  * The generic rte_mbuf, containing a packet mbuf.
-  */
-+/*
-+ * offload in the second cache line, next in the first. Better for vpp
-+ * at least as of right now.
-+ * If you change this structure, you must change the user-mode
-+ * version in rte_mbuf.h
-+ */
- struct rte_mbuf {
- 	MARKER cacheline0;
- 
-@@ -783,6 +789,12 @@ struct rte_mbuf {
- 	uint32_t pkt_len;         /**< Total pkt len: sum of all segments. */
- 	uint16_t data_len;        /**< Amount of data in segment buffer. */
- 	uint16_t vlan_tci;        /**< VLAN Tag Control Identifier (CPU order) */
-+	uint32_t seqn; /**< Sequence number. See also rte_reorder_insert() */
-+	uint16_t vlan_tci_outer;  /**< Outer VLAN Tag Control Identifier (CPU order) */
-+	struct rte_mbuf *next;    /**< Next segment of scattered packet. */
-+
-+	/* second cache line - fields only used in slow path or on TX */
-+	MARKER cacheline1 __rte_cache_min_aligned;
- 
- 	union {
- 		uint32_t rss;     /**< RSS hash result if RSS enabled */
-@@ -806,20 +818,12 @@ struct rte_mbuf {
- 		uint32_t usr;	  /**< User defined tags. See rte_distributor_process() */
- 	} hash;                   /**< hash information */
- 
--	uint32_t seqn; /**< Sequence number. See also rte_reorder_insert() */
--
--	uint16_t vlan_tci_outer;  /**< Outer VLAN Tag Control Identifier (CPU order) */
--
--	/* second cache line - fields only used in slow path or on TX */
--	MARKER cacheline1 __rte_cache_min_aligned;
--
- 	union {
- 		void *userdata;   /**< Can be used for external metadata */
- 		uint64_t udata64; /**< Allow 8-byte userdata on 32-bit */
- 	};
- 
- 	struct rte_mempool *pool; /**< Pool from which mbuf was allocated. */
--	struct rte_mbuf *next;    /**< Next segment of scattered packet. */
- 
- 	/* fields to support TX offloads */
- 	union {
--- 
-2.7.4
-