diff --git a/kernel/linux/ena/kcompat.h b/kernel/linux/ena/kcompat.h
index 32a9cc5..8d39362 100644
--- a/kernel/linux/ena/kcompat.h
+++ b/kernel/linux/ena/kcompat.h
@@ -888,21 +888,6 @@ xdp_prepare_buff(struct xdp_buff *xdp, unsigned char *hard_start,
 #define ENA_XDP_XMIT_FREES_FAILED_DESCS_INTERNALLY
 #endif
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) && \
-	!(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 188) && \
-	 LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) && \
-	!(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 251) && \
-	 LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0))) && \
-	!(defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 6)) && \
-	!(defined(SUSE_VERSION) && (SUSE_VERSION == 15 && SUSE_PATCHLEVEL >= 4)) && \
-	!(defined(SUSE_VERSION) && (SUSE_VERSION == 15 && SUSE_PATCHLEVEL == 3) && \
-	  ENA_KERNEL_VERSION_GTE(5, 3, 18, 150300, 59, 43))
-static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr)
-{
-	memcpy(dev->dev_addr, addr, ETH_ALEN);
-}
-#endif
-
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) || \
 	(defined(RHEL_RELEASE_CODE) && \
 	RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 6) && \
@@ -1112,7 +1097,7 @@ static inline void ena_dma_unmap_page_attrs(struct device *dev,
 #define pci_dev_id(pdev) ((((u16)(pdev->bus->number)) << 8) | (pdev->devfn))
 #endif /* ENA_HAVE_PCI_DEV_ID */
 
-#ifndef ENA_HAVE_XDP_DO_FLUSH
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
 #define xdp_do_flush xdp_do_flush_map
 #endif /* ENA_HAVE_XDP_DO_FLUSH */
 
@@ -1147,15 +1132,15 @@ static inline unsigned int cpumask_local_spread(unsigned int i, int node)
 }
 #endif /* ENA_HAVE_CPUMASK_LOCAL_SPREAD */
 
-#ifndef ENA_HAVE_UPDATE_AFFINITY_HINT
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
 static inline int irq_update_affinity_hint(unsigned int irq, const struct cpumask *m)
 {
 	return 0;
 }
-#endif /* ENA_HAVE_UPDATE_AFFINITY_HINT */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5.17.0) */
 
-#ifndef ENA_HAVE_ETHTOOL_PUTS
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0)
 #define ethtool_puts ethtool_sprintf
-#endif /* ENA_HAVE_ETHTOOL_PUTS */
+#endif
 
 #endif /* _KCOMPAT_H_ */