Fixes for 5.15

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.15/net-of-fix-stub-of_net-helpers-for-config_net-n.patch b/queue-5.15/net-of-fix-stub-of_net-helpers-for-config_net-n.patch
new file mode 100644 (file)
index 0000000..759de21
--- /dev/null
+++ b/queue-5.15/net-of-fix-stub-of_net-helpers-for-config_net-n.patch
@@ -0,0 +1,45 @@
+From 3258d71f32585ed5ed73a758ee30a7e2792225ae Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 14 Oct 2021 11:00:37 +0200
+Subject: net: of: fix stub of_net helpers for CONFIG_NET=n
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+[ Upstream commit 8b017fbe0bbb98dd71fb4850f6b9cc0e136a26b8 ]
+
+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>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ include/linux/of_net.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/linux/of_net.h b/include/linux/of_net.h
+index cf31188329b5a..55460ecfa50ad 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;
+-- 
+2.34.1
+

diff --git a/queue-5.15/series b/queue-5.15/series
index adece2a912f2489f6c8d121c4b07b86cabdc36c9..f75d9ba998678559554e3971cfc761fe59f7dcd6 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -133,3 +133,4 @@ drm-amd-display-fix-stream-link_enc-unassigned-durin.patch
 bnxt_en-fix-occasional-ethtool-t-loopback-test-failu.patch
 drm-amd-display-for-vblank_disable_immediate-check-p.patch
 pci-mvebu-fix-device-enumeration-regression.patch
+net-of-fix-stub-of_net-helpers-for-config_net-n.patch