tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
net: sb1000,rionet: use eth_hw_addr_set()
Get these two oldies ready for constant netdev->dev_addr.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+16
-10
+8
-6
drivers/net/rionet.c
+8
-6
drivers/net/rionet.c
···
482
482
{
483
483
int rc = 0;
484
484
struct rionet_private *rnet;
485
+
u8 addr[ETH_ALEN];
485
486
u16 device_id;
486
487
const size_t rionet_active_bytes = sizeof(void *) *
487
488
RIO_MAX_ROUTE_ENTRIES(mport->sys_size);
···
502
501
503
502
/* Set the default MAC address */
504
503
device_id = rio_local_get_device_id(mport);
505
-
ndev->dev_addr[0] = 0x00;
506
-
ndev->dev_addr[1] = 0x01;
507
-
ndev->dev_addr[2] = 0x00;
508
-
ndev->dev_addr[3] = 0x01;
509
-
ndev->dev_addr[4] = device_id >> 8;
510
-
ndev->dev_addr[5] = device_id & 0xff;
504
+
addr[0] = 0x00;
505
+
addr[1] = 0x01;
506
+
addr[2] = 0x00;
507
+
addr[3] = 0x01;
508
+
addr[4] = device_id >> 8;
509
+
addr[5] = device_id & 0xff;
510
+
eth_hw_addr_set(ndev, addr);
511
511
512
512
ndev->netdev_ops = &rionet_netdev_ops;
513
513
ndev->mtu = RIONET_MAX_MTU;
+8
-4
drivers/net/sb1000.c
+8
-4
drivers/net/sb1000.c
···
149
149
unsigned short ioaddr[2], irq;
150
150
unsigned int serial_number;
151
151
int error = -ENODEV;
152
+
u8 addr[ETH_ALEN];
152
153
153
154
if (pnp_device_attach(pdev) < 0)
154
155
return -ENODEV;
···
204
203
dev->netdev_ops = &sb1000_netdev_ops;
205
204
206
205
/* hardware address is 0:0:serial_number */
207
-
dev->dev_addr[2] = serial_number >> 24 & 0xff;
208
-
dev->dev_addr[3] = serial_number >> 16 & 0xff;
209
-
dev->dev_addr[4] = serial_number >> 8 & 0xff;
210
-
dev->dev_addr[5] = serial_number >> 0 & 0xff;
206
+
addr[0] = 0;
207
+
addr[1] = 0;
208
+
addr[2] = serial_number >> 24 & 0xff;
209
+
addr[3] = serial_number >> 16 & 0xff;
210
+
addr[4] = serial_number >> 8 & 0xff;
211
+
addr[5] = serial_number >> 0 & 0xff;
212
+
eth_hw_addr_set(dev, addr);
211
213
212
214
pnp_set_drvdata(pdev, dev);
213
215