diff --git a/drivers/intel/iavf/iavf-4.5.3-zc/src/kcompat_std_defs.h b/drivers/intel/iavf/iavf-4.5.3-zc/src/kcompat_std_defs.h
index 427efcbac1..b44c1c88d4 100644
--- a/drivers/intel/iavf/iavf-4.5.3-zc/src/kcompat_std_defs.h
+++ b/drivers/intel/iavf/iavf-4.5.3-zc/src/kcompat_std_defs.h
@@ -217,6 +217,9 @@
 #define NEED_XSK_BUFF_DMA_SYNC_FOR_CPU
 #define NEED_XSK_BUFF_POOL_RENAME
 #define NEED_ETH_HW_ADDR_SET
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0) && LINUX_VERSION_CODE <  KERNEL_VERSION(5,5,0)) // Ubuntu 20 does not require this
+#undef NEED_ETH_HW_ADDR_SET
+#endif
 #else /* >= 5.10.0 */
 #define HAVE_DEVLINK_RELOAD_ACTION_AND_LIMIT
 #define HAVE_DEVLINK_REGION_OPS_SNAPSHOT_OPS