diff mbox series

[net-next] net: of: fix stub of_net helpers for CONFIG_NET=n

Message ID 20211014090055.2058949-1-arnd@kernel.org (mailing list archive)
State Accepted
Commit 8b017fbe0bbb98dd71fb4850f6b9cc0e136a26b8
Delegated to: Netdev Maintainers
Headers show
Series [net-next] net: of: fix stub of_net helpers for CONFIG_NET=n | expand

Checks

Context Check Description
netdev/cover_letter success Single patches do not need cover letters
netdev/fixes_present success Fixes tag not required for -next series
netdev/patch_count success Link
netdev/tree_selection success Clearly marked for net-next
netdev/subject_prefix success Link
netdev/cc_maintainers warning 2 maintainers not CCed: linux@armlinux.org.uk hkallweit1@gmail.com
netdev/source_inline success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/module_param success Was 0 now: 0
netdev/build_32bit success Errors and warnings before: 194 this patch: 194
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/verify_fixes success Fixes tag looks correct
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 8 lines checked
netdev/build_allmodconfig_warn success Errors and warnings before: 168 this patch: 168
netdev/header_inline success No static functions without inline keyword in header files

Commit Message

Arnd Bergmann Oct. 14, 2021, 9 a.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>

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/")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 include/linux/of_net.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

patchwork-bot+netdevbpf@kernel.org Oct. 14, 2021, 11 p.m. UTC | #1 
Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Thu, 14 Oct 2021 11:00:37 +0200 you wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> 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
diff mbox series

Patch

diff --git a/include/linux/of_net.h b/include/linux/of_net.h
index 0797e2edb8c2..0484b613ca64 100644
--- a/include/linux/of_net.h
+++ b/include/linux/of_net.h
@@ -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;