diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2021-10-14 11:00:37 +0200 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2021-10-14 15:59:04 -0700 |
| commit | 8b017fbe0bbb98dd71fb4850f6b9cc0e136a26b8 (patch) | |
| tree | 9629d7a7442bd354e6d14cd0c337cd7d09c70915 /include/linux/of_net.h | |
| parent | ethernet: remove random_ether_addr() (diff) | |
| download | linux-dev-8b017fbe0bbb98dd71fb4850f6b9cc0e136a26b8.tar.xz linux-dev-8b017fbe0bbb98dd71fb4850f6b9cc0e136a26b8.zip | |
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>
Diffstat (limited to 'include/linux/of_net.h')
| -rw-r--r-- | include/linux/of_net.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |