diff --git a/drivers/net/ethernet/lantiq/datapath/datapath_api.c b/drivers/net/ethernet/lantiq/datapath/datapath_api.c
index 8f23a0a32922280fdc488ebf6f14334c24a41634..7b72b27bfdf4c365fb340ff1db4e5aabc86e1997 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 0ba8e83d666869c194e475a5bb19f067953d6f3a..73d42f77dd095900acda3ff3cfd8fc43656cc1a6 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: */