linux-next: build failure after merge of the net-next tree

Stephen Rothwell
2021-10-11T06:34:31Z

[-- Attachment #1: Type: text/plain, Size: 1700 bytes --]

Hi all,

After merging the net-next tree, today's linux-next build (sparc64
defconfig) failed like this:

drivers/net/ethernet/sun/ldmvsw.c: In function 'vsw_alloc_netdev':
drivers/net/ethernet/sun/ldmvsw.c:243:2: error: expected ';' before 'sprintf'
sprintf(dev->name, "vif%d.%d", (int)handle, (int)port_id);
^~~~~~~

Caused by commit

a7639279c93c ("ethernet: sun: remove direct netdev->dev_addr writes")

I have applied the following fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Oct 2021 17:24:43 +1100
Subject: [PATCH] ethernet: sun: fix for "remove direct netdev->dev_addr writes"

Fix for this build problem:

drivers/net/ethernet/sun/ldmvsw.c: In function 'vsw_alloc_netdev':
drivers/net/ethernet/sun/ldmvsw.c:243:2: error: expected ';' before 'sprintf'
sprintf(dev->name, "vif%d.%d", (int)handle, (int)port_id);
^~~~~~~

Fixes: a7639279c93c ("ethernet: sun: remove direct netdev->dev_addr writes")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/ethernet/sun/ldmvsw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/sun/ldmvsw.c b/drivers/net/ethernet/sun/ldmvsw.c
index 074c5407c86b..6b59b14e74b1 100644
--- a/drivers/net/ethernet/sun/ldmvsw.c
+++ b/drivers/net/ethernet/sun/ldmvsw.c
@@ -238,7 +238,7 @@ static struct net_device *vsw_alloc_netdev(u8 hwaddr[],
dev->needed_tailroom = 8;

eth_hw_addr_set(dev, hwaddr);
- ether_addr_copy(dev->perm_addr, dev->dev_addr)
+ ether_addr_copy(dev->perm_addr, dev->dev_addr);

sprintf(dev->name, "vif%d.%d", (int)handle, (int)port_id);

--
2.33.0

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]