Commit ea52a0b5 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net: use dev_addr_set() 



Use dev_addr_set() instead of writing directly to netdev->dev_addr
in various misc and old drivers.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 794a69b3

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4414,7 +4414,7 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr) 
	}



	/* success */

	memcpy(bond_dev->dev_addr, ss->__data, bond_dev->addr_len);

	dev_addr_set(bond_dev, ss->__data);

	return 0;



unwind:

drivers/net/hamradio/baycom_epp.c

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ static int baycom_set_mac_address(struct net_device *dev, void *addr) 
	struct sockaddr *sa = (struct sockaddr *)addr;



	/* addr is an AX.25 shifted ASCII mac address */

	memcpy(dev->dev_addr, sa->sa_data, dev->addr_len); 

	dev_addr_set(dev, sa->sa_data);

	return 0;                                         

}

drivers/net/hamradio/bpqether.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static int bpq_set_mac_address(struct net_device *dev, void *addr) 
{

    struct sockaddr *sa = (struct sockaddr *)addr;



    memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);

    dev_addr_set(dev, sa->sa_data);



    return 0;

}

drivers/net/hamradio/dmascc.c

+1 −2
Original line number Diff line number Diff line
@@ -956,8 +956,7 @@ static int scc_send_packet(struct sk_buff *skb, struct net_device *dev) 


static int scc_set_mac_address(struct net_device *dev, void *sa)

{

	memcpy(dev->dev_addr, ((struct sockaddr *) sa)->sa_data,

	       dev->addr_len);

	dev_addr_set(dev, ((struct sockaddr *)sa)->sa_data);

	return 0;

}

drivers/net/hamradio/hdlcdrv.c

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static int hdlcdrv_set_mac_address(struct net_device *dev, void *addr) 
	struct sockaddr *sa = (struct sockaddr *)addr;



	/* addr is an AX.25 shifted ASCII mac address */

	memcpy(dev->dev_addr, sa->sa_data, dev->addr_len); 

	dev_addr_set(dev, sa->sa_data);

	return 0;                                         

}