Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24f34f67 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Greg Kroah-Hartman
Browse files

net: create netdev->dev_addr assignment helpers 



[ Upstream commit 48eab831ae8b9f7002a533fa4235eed63ea1f1a3 ]

Recent work on converting address list to a tree made it obvious
we need an abstraction around writing netdev->dev_addr. Without
such abstraction updating the main device address is invisible
to the core.

Introduce a number of helpers which for now just wrap memcpy()
but in the future can make necessary changes to the address
tree.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent dd5dca10

include/linux/etherdevice.h

+12 −0
Original line number Diff line number Diff line
@@ -288,6 +288,18 @@ static inline void ether_addr_copy(u8 *dst, const u8 *src) 
#endif

}



/**

 * eth_hw_addr_set - Assign Ethernet address to a net_device

 * @dev: pointer to net_device structure

 * @addr: address to assign

 *

 * Assign given address to the net_device, addr_assign_type is not changed.

 */

static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr)

{

	ether_addr_copy(dev->dev_addr, addr);

}



/**

 * eth_hw_addr_inherit - Copy dev_addr from another net_device

 * @dst: pointer to net_device to copy dev_addr to

include/linux/netdevice.h

+18 −0
Original line number Diff line number Diff line
@@ -4189,6 +4189,24 @@ void __hw_addr_unsync_dev(struct netdev_hw_addr_list *list, 
void __hw_addr_init(struct netdev_hw_addr_list *list);



/* Functions used for device addresses handling */

static inline void

__dev_addr_set(struct net_device *dev, const u8 *addr, size_t len)

{

	memcpy(dev->dev_addr, addr, len);

}



static inline void dev_addr_set(struct net_device *dev, const u8 *addr)

{

	__dev_addr_set(dev, addr, dev->addr_len);

}



static inline void

dev_addr_mod(struct net_device *dev, unsigned int offset,

	     const u8 *addr, size_t len)

{

	memcpy(&dev->dev_addr[offset], addr, len);

}



int dev_addr_add(struct net_device *dev, const unsigned char *addr,

		 unsigned char addr_type);

int dev_addr_del(struct net_device *dev, const unsigned char *addr,