Skip to contentSkip to conversation

net: of: fix stub of_net helpers for CONFIG_NET=n

PATCH Applied Arnd Bergmann 2 participants 2 messages Oct 14, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: of: fix stub of_net helpers for CONFIG_NET=n

From: Arnd Bergmann <[email protected]>

Moving the of_net code from drivers/of/ to net/core means we no longer stub out the helpers when networking is disabled, which leads to a randconfig build failure with at least one ARM platform that calls this from non-networking code:

arm-linux-gnueabi-ld: arch/arm/mach-mvebu/kirkwood.o: in function `kirkwood_dt_eth_fixup':
kirkwood.c:(.init.text+0x54): undefined reference to `of_get_mac_address'

Restore the way this worked before by changing that #ifdef check back to testing for both CONFIG_OF and CONFIG_NET.

Fixes e330fb14590c ("of: net: move of_net under net/")
---
 include/linux/of_net.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/of_net.h +1 -1
index 0797e2edb8c2..0484b613ca64 100644
@@ -8,7 +8,7 @@
 
 #include <linux/phy.h>
 
-#ifdef CONFIG_OF
+#if defined(CONFIG_OF) && defined(CONFIG_NET)
 #include <linux/of.h>
 
 struct net_device;
Signature · 1 line
2.29.2
#1 lore raw
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Thu, 14 Oct 2021 11:00:37 +0200 you wrote:

From: Arnd Bergmann <[email protected]>

Moving the of_net code from drivers/of/ to net/core means we no longer stub out the helpers when networking is disabled, which leads to a randconfig build failure with at least one ARM platform that calls this from non-networking code:

[...]

Here is the summary with links:
- [net-next] net: of: fix stub of_net helpers for CONFIG_NET=n

    https://git.kernel.org/netdev/net-next/c/8b017fbe0bbb

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html