OSDN Git Service

net: of: fix stub of_net helpers for CONFIG_NET=n
authorArnd Bergmann <arnd@arndb.de>
Thu, 14 Oct 2021 09:00:37 +0000 (11:00 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 14 Oct 2021 22:59:04 +0000 (15:59 -0700)
commit8b017fbe0bbb98dd71fb4850f6b9cc0e136a26b8
tree9629d7a7442bd354e6d14cd0c337cd7d09c70915
parentba530fea8ca1b57ee71d4e62f287a5d7ed92f789
net: of: fix stub of_net helpers for CONFIG_NET=n

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>
Link: https://lore.kernel.org/r/20211014090055.2058949-1-arnd@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
include/linux/of_net.h