Commit 07591ebe authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-don-t-write-directly-to-netdev-dev_addr' 

Don't write directly to netdev->dev_addr.

More conversions, mostly in usb/net.

v2: leave out catc (patch 4)

Link: https://lore.kernel.org/r/20211021131214.2032925-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 016c8946 65a4fbbf

drivers/net/fddi/defxx.c

+3 −3
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ static int dfx_driver_init(struct net_device *dev, const char *print_name, 
	 *       dfx_ctl_set_mac_address.

	 */



	memcpy(dev->dev_addr, bp->factory_mac_addr, FDDI_K_ALEN);

	dev_addr_set(dev, bp->factory_mac_addr);

	if (dfx_bus_tc)

		board_name = "DEFTA";

	if (dfx_bus_eisa)
@@ -1474,7 +1474,7 @@ static int dfx_open(struct net_device *dev) 
	 *		 address.

	 */



	memcpy(dev->dev_addr, bp->factory_mac_addr, FDDI_K_ALEN);

	dev_addr_set(dev, bp->factory_mac_addr);



	/* Clear local unicast/multicast address tables and counts */
@@ -2379,7 +2379,7 @@ static int dfx_ctl_set_mac_address(struct net_device *dev, void *addr) 


	/* Copy unicast address to driver-maintained structs and update count */



	memcpy(dev->dev_addr, p_sockaddr->sa_data, FDDI_K_ALEN);	/* update device struct */

	dev_addr_set(dev, p_sockaddr->sa_data);				/* update device struct */

	memcpy(&bp->uc_table[0], p_sockaddr->sa_data, FDDI_K_ALEN);	/* update driver struct */

	bp->uc_count = 1;

drivers/net/fddi/defza.c

+1 −1
Original line number Diff line number Diff line
@@ -1380,7 +1380,7 @@ static int fza_probe(struct device *bdev) 
		goto err_out_irq;



	fza_reads(&init->hw_addr, &hw_addr, sizeof(hw_addr));

	memcpy(dev->dev_addr, &hw_addr, FDDI_K_ALEN);

	dev_addr_set(dev, &hw_addr);



	fza_reads(&init->rom_rev, &rom_rev, sizeof(rom_rev));

	fza_reads(&init->fw_rev, &fw_rev, sizeof(fw_rev));

drivers/net/fddi/skfp/h/smc.h

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ void card_stop(struct s_smc *smc); 
void init_board(struct s_smc *smc, u_char *mac_addr);

int init_fplus(struct s_smc *smc);

void init_plc(struct s_smc *smc);

int init_smt(struct s_smc *smc, u_char *mac_addr);

int init_smt(struct s_smc *smc, const u_char *mac_addr);

void mac1_irq(struct s_smc *smc, u_short stu, u_short stl);

void mac2_irq(struct s_smc *smc, u_short code_s2u, u_short code_s2l);

void mac3_irq(struct s_smc *smc, u_short code_s3u, u_short code_s3l);

drivers/net/fddi/skfp/skfddi.c

+1 −1
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ static int skfp_ctl_set_mac_address(struct net_device *dev, void *addr) 
	unsigned long Flags;





	memcpy(dev->dev_addr, p_sockaddr->sa_data, FDDI_K_ALEN);

	dev_addr_set(dev, p_sockaddr->sa_data);

	spin_lock_irqsave(&bp->DriverLock, Flags);

	ResetAdapter(smc);

	spin_unlock_irqrestore(&bp->DriverLock, Flags);

drivers/net/fddi/skfp/smtinit.c

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "h/fddi.h"

#include "h/smc.h"



void init_fddi_driver(struct s_smc *smc, u_char *mac_addr);

void init_fddi_driver(struct s_smc *smc, const u_char *mac_addr);



/* define global debug variable */

#if defined(DEBUG) && !defined(DEBUG_BRD)
@@ -57,7 +57,7 @@ static void set_oem_spec_val(struct s_smc *smc) 
/*

 * Init SMT

 */

int init_smt(struct s_smc *smc, u_char *mac_addr)

int init_smt(struct s_smc *smc, const u_char *mac_addr)

/* u_char *mac_addr;	canonical address or NULL */

{

	int	p ;