From 0add97784bcb491802191ce50ce20050016a4e40 Mon Sep 17 00:00:00 2001
From: "Nagaraj, Suresh" <suresh.nagaraj@intel.com>
Date: Fri, 9 Feb 2018 06:30:42 +0100
Subject: [PATCH] Merge pull request #245 in SW_PON/linux from
 bugfix/UGW_SW-22236-ppa-flag-not-set-in-datapath-library-and-skb-dw-fields-are-not-copied
 to xrx500

* commit 'd2e153b317e65cdd664802d845f8dc7015d3d713':
  UGW_SW-22236: set ppa flag and move skb DWs inside headers_start
---
 drivers/net/ethernet/lantiq/datapath/datapath_api.c | 6 +++---
 include/linux/skbuff.h                              | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/lantiq/datapath/datapath_api.c b/drivers/net/ethernet/lantiq/datapath/datapath_api.c
index 8f23a0a32..7b72b27bf 100644
--- a/drivers/net/ethernet/lantiq/datapath/datapath_api.c
+++ b/drivers/net/ethernet/lantiq/datapath/datapath_api.c
@@ -32,8 +32,8 @@
 
 /*#include <linux/ltq_hwmcpy.h>*/
 
-#if IS_ENABLED(CONFIG_LTQ_PPA_API_SW_FASTPATH)
-#include <net/ppa_api.h>
+#if IS_ENABLED(CONFIG_PPA_API_SW_FASTPATH)
+#include <net/ppa/ppa_api.h>
 #endif
 
 #if defined(CONFIG_LTQ_DATAPATH_DBG) && CONFIG_LTQ_DATAPATH_DBG
@@ -1662,7 +1662,7 @@ static inline int32_t dp_rx_one_skb(struct sk_buff *skb, uint32_t flags)
 		       desc_3, parser, pmac, paser_exist);
 	if (paser_exist) {
 		skb_pull(skb, paser_exist);	/*remove parser */
-#if IS_ENABLED(CONFIG_LTQ_PPA_API_SW_FASTPATH)
+#if IS_ENABLED(CONFIG_PPA_API_SW_FASTPATH)
 		skb->mark |= FLG_PPA_PROCESSED;
 #endif
 	}
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 0ba8e83d6..73d42f77d 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -650,9 +650,6 @@ struct sk_buff {
 		};
 		struct rb_node	rbnode; /* used in netem & tcp stack */
 	};
-#if defined(CONFIG_LTQ_CBM) || IS_ENABLED(CONFIG_DIRECTCONNECT_DP_API)
-	__u32 DW0, DW1, DW2, DW3;
-#endif
 #ifdef CONFIG_LTQ_DATAPATH_SKB
 	struct ltq_dp_skb dp_skb_info;
 #endif    
@@ -805,6 +802,10 @@ struct sk_buff {
 	__u16			network_header;
 	__u16			mac_header;
 
+#if defined(CONFIG_LTQ_CBM) || IS_ENABLED(CONFIG_DIRECTCONNECT_DP_API)
+	__u32 DW0, DW1, DW2, DW3;
+#endif
+
 	/* private: */
 	__u32			headers_end[0];
 	/* public: */
-- 
GitLab