Index: i40e-2.22.20/src/i40e_txrx.c
===================================================================
--- i40e-2.22.20.orig/src/i40e_txrx.c
+++ i40e-2.22.20/src/i40e_txrx.c
@@ -2320,16 +2320,15 @@
 void i40e_process_skb_fields(struct i40e_ring *rx_ring,
 			     union i40e_rx_desc *rx_desc, struct sk_buff *skb)
 {
-#ifdef HAVE_PTP_1588_CLOCK
 	u64 qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);
+	u32 rx_ptype = (qword & I40E_RXD_QW1_PTYPE_MASK) >>
+		       I40E_RXD_QW1_PTYPE_SHIFT;
+#ifdef HAVE_PTP_1588_CLOCK
 	u32 rx_status = (qword & I40E_RXD_QW1_STATUS_MASK) >>
 			I40E_RXD_QW1_STATUS_SHIFT;
 	u32 tsynvalid = rx_status & I40E_RXD_QW1_STATUS_TSYNVALID_MASK;
 	u32 tsyn = (rx_status & I40E_RXD_QW1_STATUS_TSYNINDX_MASK) >>
 		   I40E_RXD_QW1_STATUS_TSYNINDX_SHIFT;
-	u32 rx_ptype = (qword & I40E_RXD_QW1_PTYPE_MASK) >>
-		       I40E_RXD_QW1_PTYPE_SHIFT;
-
 	if (unlikely(tsynvalid))
 		i40e_ptp_rx_hwtstamp(rx_ring->vsi->back, skb, tsyn);
 #endif /* HAVE_PTP_1588_CLOCK */
@@ -2945,7 +2944,9 @@
 	u16 cleaned_count = I40E_DESC_UNUSED(rx_ring);
 	unsigned int xdp_xmit = 0;
 	bool failure = false;
+#ifndef CONFIG_I40E_DISABLE_PACKET_SPLIT
 	struct xdp_buff xdp;
+#endif
 	u16 tpid;
 
 #ifdef HAVE_XDP_BUFF_FRAME_SZ