Mian Yousaf Kaukab 0d4ccc
From: Arnd Bergmann <arnd@arndb.de>
Mian Yousaf Kaukab 0d4ccc
Date: Thu, 22 Apr 2021 15:35:11 +0200
Mian Yousaf Kaukab 0d4ccc
Subject: net: enetc: fix link error again
Mian Yousaf Kaukab 0d4ccc
Mian Yousaf Kaukab 0d4ccc
Git-commit: 74c97ea3b61e4ce149444f904ee8d4fc7073505b
Mian Yousaf Kaukab 0d4ccc
Patch-mainline: v5.13-rc1
Mian Yousaf Kaukab 0d4ccc
References: git-fixes
Mian Yousaf Kaukab 0d4ccc
Mian Yousaf Kaukab 0d4ccc
A link time bug that I had fixed before has come back now that
Mian Yousaf Kaukab 0d4ccc
another sub-module was added to the enetc driver:
Mian Yousaf Kaukab 0d4ccc
Mian Yousaf Kaukab 0d4ccc
ERROR: modpost: "enetc_ierb_register_pf" [drivers/net/ethernet/freescale/enetc/fsl-enetc.ko] undefined!
Mian Yousaf Kaukab 0d4ccc
Mian Yousaf Kaukab 0d4ccc
The problem is that the enetc Makefile is not actually used for
Mian Yousaf Kaukab 0d4ccc
the ierb module if that is the only built-in driver in there
Mian Yousaf Kaukab 0d4ccc
and everything else is a loadable module.
Mian Yousaf Kaukab 0d4ccc
Mian Yousaf Kaukab 0d4ccc
Fix it by always entering the directory this time, regardless
Mian Yousaf Kaukab 0d4ccc
of which symbols are configured. This should reliably fix the
Mian Yousaf Kaukab 0d4ccc
problem and prevent it from coming back another time.
Mian Yousaf Kaukab 0d4ccc
Mian Yousaf Kaukab 0d4ccc
Fixes: 112463ddbe82 ("net: dsa: felix: fix link error")
Mian Yousaf Kaukab 0d4ccc
Fixes: e7d48e5fbf30 ("net: enetc: add a mini driver for the Integrated Endpoint Register Block")
Mian Yousaf Kaukab 0d4ccc
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Mian Yousaf Kaukab 0d4ccc
Acked-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Mian Yousaf Kaukab 0d4ccc
Signed-off-by: David S. Miller <davem@davemloft.net>
Mian Yousaf Kaukab 0d4ccc
Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
Mian Yousaf Kaukab 0d4ccc
---
Mian Yousaf Kaukab 0d4ccc
 drivers/net/ethernet/freescale/Makefile | 4 +---
Mian Yousaf Kaukab 0d4ccc
 1 file changed, 1 insertion(+), 3 deletions(-)
Mian Yousaf Kaukab 0d4ccc
Mian Yousaf Kaukab 0d4ccc
diff --git a/drivers/net/ethernet/freescale/Makefile b/drivers/net/ethernet/freescale/Makefile
Mian Yousaf Kaukab 0d4ccc
index 67c436400352..de7b31842233 100644
Mian Yousaf Kaukab 0d4ccc
--- a/drivers/net/ethernet/freescale/Makefile
Mian Yousaf Kaukab 0d4ccc
+++ b/drivers/net/ethernet/freescale/Makefile
Mian Yousaf Kaukab 0d4ccc
@@ -24,6 +24,4 @@ obj-$(CONFIG_FSL_DPAA_ETH) += dpaa/
Mian Yousaf Kaukab 0d4ccc
 
Mian Yousaf Kaukab 0d4ccc
 obj-$(CONFIG_FSL_DPAA2_ETH) += dpaa2/
Mian Yousaf Kaukab 0d4ccc
 
Mian Yousaf Kaukab 0d4ccc
-obj-$(CONFIG_FSL_ENETC) += enetc/
Mian Yousaf Kaukab 0d4ccc
-obj-$(CONFIG_FSL_ENETC_MDIO) += enetc/
Mian Yousaf Kaukab 0d4ccc
-obj-$(CONFIG_FSL_ENETC_VF) += enetc/
Mian Yousaf Kaukab 0d4ccc
+obj-y += enetc/
Mian Yousaf Kaukab 0d4ccc
-- 
Mian Yousaf Kaukab 0d4ccc
2.26.2
Mian Yousaf Kaukab 0d4ccc