From 87eff41c80501444ae9bf4c8788a00daaa641cf2 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Wed, 1 Apr 2020 16:25:28 +0800
Subject: [PATCH] i40e: adjust dependency

---
 package/kernel/linux/modules/netdevices.mk |  4 ++--
 package/kernel/linux/modules/netfilter.mk  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index a4723c9b62..16f70f77cf 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -656,7 +656,7 @@ $(eval $(call KernelPackage,ixgbevf))
 define KernelPackage/i40e
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Intel(R) Ethernet Controller XL710 Family support
-  DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-ptp +kmod-hwmon-core
+  DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-ptp +kmod-hwmon-core +@LINUX_5_4:kmod-libphy
   KCONFIG:=CONFIG_I40E \
     CONFIG_I40E_DCB=n
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/i40e/i40e.ko
@@ -673,7 +673,7 @@ $(eval $(call KernelPackage,i40e))
 define KernelPackage/i40evf
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Intel(R) Ethernet Adaptive Virtual Function support
-  DEPENDS:=@!LINUX_5_4 @PCI_SUPPORT +kmod-i40e
+  DEPENDS:=@PCI_SUPPORT +kmod-i40e
   KCONFIG:=CONFIG_I40EVF
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/i40evf/i40evf.ko
   AUTOLOAD:=$(call AutoProbe,i40evf)
diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index 6bbce437d0..eadbec45d9 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -514,7 +514,7 @@ define KernelPackage/ipt-bandwidth
   KCONFIG:=$(KCONFIG_IPT_BANDWIDTH)
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*bandwidth*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_BANDWIDTH-m)))
-  DEPENDS:= kmod-ipt-core
+  DEPENDS:= @!LINUX_5_4 kmod-ipt-core
 endef
 $(eval $(call KernelPackage,ipt-bandwidth))
 
@@ -525,7 +525,7 @@ define KernelPackage/ipt-timerange
   KCONFIG:=$(KCONFIG_IPT_TIMERANGE)
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*timerange*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_TIMERANGE-m)))
-  DEPENDS:= kmod-ipt-core
+  DEPENDS:= @!LINUX_5_4 kmod-ipt-core
 endef
 $(eval $(call KernelPackage,ipt-timerange))
 
@@ -536,7 +536,7 @@ define KernelPackage/ipt-webmon
   KCONFIG:=$(KCONFIG_IPT_WEBMON)
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*webmon*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_WEBMON-m)))
-  DEPENDS:= kmod-ipt-core
+  DEPENDS:= @!LINUX_5_4 kmod-ipt-core
 endef
 $(eval $(call KernelPackage,ipt-webmon))
 
@@ -547,7 +547,7 @@ define KernelPackage/ipt-weburl
   KCONFIG:=$(KCONFIG_IPT_WEBURL)
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*weburl*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_WEBURL-m)))
-  DEPENDS:= kmod-ipt-core
+  DEPENDS:= @!LINUX_5_4 kmod-ipt-core
 endef
 $(eval $(call KernelPackage,ipt-weburl))
 
@@ -1132,7 +1132,7 @@ $(eval $(call KernelPackage,ipt-rpfilter))
 define KernelPackage/nft-core
   SUBMENU:=$(NF_MENU)
   TITLE:=Netfilter nf_tables support
-  DEPENDS:=+kmod-nfnetlink +kmod-nf-reject +kmod-nf-reject6 +kmod-nf-conntrack6
+  DEPENDS:=+kmod-nfnetlink +kmod-nf-reject +kmod-nf-reject6 +kmod-nf-conntrack6 +@LINUX_5_4:kmod-nf-nat
   FILES:=$(foreach mod,$(NFT_CORE-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_CORE-m)))
   KCONFIG:= \