a0b827b916
kirkwood build broke due to missing include needed for ETH_ALEN.
Add patch (sent upstream as well) to address that.
Refresh patches for 5.4 and 5.10.
Fixes: 91a52f22a1 ("treewide: backport support for nvmem on non platform devices")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
62 lines
2.4 KiB
Diff
62 lines
2.4 KiB
Diff
From patchwork Thu Aug 5 22:23:30 2021
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
|
|
X-Patchwork-Id: 12422209
|
|
Date: Thu, 5 Aug 2021 23:23:30 +0100
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
To: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org,
|
|
linux-kernel@vger.kernel.org
|
|
Cc: "David S. Miller" <davem@davemloft.net>, Andrew Lunn <andrew@lunn.ch>,
|
|
Michael Walle <michael@walle.cc>
|
|
Subject: [PATCH] ARM: kirkwood: add missing <linux/if_ether.h> for ETH_ALEN
|
|
Message-ID: <YQxk4jrbm31NM1US@makrotopia.org>
|
|
MIME-Version: 1.0
|
|
Content-Disposition: inline
|
|
X-BeenThere: linux-arm-kernel@lists.infradead.org
|
|
X-Mailman-Version: 2.1.34
|
|
Precedence: list
|
|
List-Id: <linux-arm-kernel.lists.infradead.org>
|
|
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
|
|
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
|
|
|
|
After commit 83216e3988cd1 ("of: net: pass the dst buffer to
|
|
of_get_mac_address()") build fails for kirkwood as ETH_ALEN is not
|
|
defined.
|
|
|
|
arch/arm/mach-mvebu/kirkwood.c: In function 'kirkwood_dt_eth_fixup':
|
|
arch/arm/mach-mvebu/kirkwood.c:87:13: error: 'ETH_ALEN' undeclared (first use in this function); did you mean 'ESTALE'?
|
|
u8 tmpmac[ETH_ALEN];
|
|
^~~~~~~~
|
|
ESTALE
|
|
arch/arm/mach-mvebu/kirkwood.c:87:13: note: each undeclared identifier is reported only once for each function it appears in
|
|
arch/arm/mach-mvebu/kirkwood.c:87:6: warning: unused variable 'tmpmac' [-Wunused-variable]
|
|
u8 tmpmac[ETH_ALEN];
|
|
^~~~~~
|
|
make[5]: *** [scripts/Makefile.build:262: arch/arm/mach-mvebu/kirkwood.o] Error 1
|
|
make[5]: *** Waiting for unfinished jobs....
|
|
|
|
Add missing #include <linux/if_ether.h> to fix this.
|
|
|
|
Cc: David S. Miller <davem@davemloft.net>
|
|
Cc: Andrew Lunn <andrew@lunn.ch>
|
|
Cc: Michael Walle <michael@walle.cc>
|
|
Reported-by: https://buildbot.openwrt.org/master/images/#/builders/56/builds/220/steps/44/logs/stdio
|
|
Fixes: 83216e3988cd1 ("of: net: pass the dst buffer to of_get_mac_address()")
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
arch/arm/mach-mvebu/kirkwood.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/arch/arm/mach-mvebu/kirkwood.c
|
|
+++ b/arch/arm/mach-mvebu/kirkwood.c
|
|
@@ -14,6 +14,7 @@
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mbus.h>
|
|
+#include <linux/if_ether.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_net.h>
|