Commit 400f17d3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-use-dev_addr_set-in-hamradio-and-ip-tunnels' 

Jakub Kicinski says:

====================
net: use dev_addr_set() in hamradio and ip tunnels

Commit 406f42fa ("net-next: When a bond have a massive amount
of VLANs...") introduced a rbtree for faster Ethernet address look
up. To maintain netdev->dev_addr in this tree we need to make all
the writes to it got through appropriate helpers.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents fe83fe73 5a1b7e1a

drivers/net/hamradio/6pack.c

+3 −3
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static int sp_set_mac_address(struct net_device *dev, void *addr) 


	netif_tx_lock_bh(dev);

	netif_addr_lock(dev);

	memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);

	__dev_addr_set(dev, &sa->sax25_call, AX25_ADDR_LEN);

	netif_addr_unlock(dev);

	netif_tx_unlock_bh(dev);
@@ -317,7 +317,7 @@ static void sp_setup(struct net_device *dev) 


	/* Only activated in AX.25 mode */

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);

	dev_addr_set(dev, (u8 *)&ax25_defaddr);



	dev->flags		= 0;

}
@@ -726,7 +726,7 @@ static int sixpack_ioctl(struct tty_struct *tty, struct file *file, 
			}



			netif_tx_lock_bh(dev);

			memcpy(dev->dev_addr, &addr, AX25_ADDR_LEN);

			__dev_addr_set(dev, &addr, AX25_ADDR_LEN);

			netif_tx_unlock_bh(dev);

			err = 0;

			break;

drivers/net/hamradio/baycom_epp.c

+1 −1
Original line number Diff line number Diff line
@@ -1159,7 +1159,7 @@ static void baycom_probe(struct net_device *dev) 
	dev->mtu = AX25_DEF_PACLEN;        /* eth_mtu is the default */

	dev->addr_len = AX25_ADDR_LEN;     /* sizeof an ax.25 address */

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, &null_ax25_address, AX25_ADDR_LEN);

	dev_addr_set(dev, (u8 *)&null_ax25_address);

	dev->tx_queue_len = 16;



	/* New style flags */

drivers/net/hamradio/bpqether.c

+2 −3
Original line number Diff line number Diff line
@@ -457,9 +457,6 @@ static void bpq_setup(struct net_device *dev) 
	dev->netdev_ops	     = &bpq_netdev_ops;

	dev->needs_free_netdev = true;



	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr,  &ax25_defaddr, AX25_ADDR_LEN);



	dev->flags      = 0;

	dev->features	= NETIF_F_LLTX;	/* Allow recursion */
@@ -472,6 +469,8 @@ static void bpq_setup(struct net_device *dev) 
	dev->mtu             = AX25_DEF_PACLEN;

	dev->addr_len        = AX25_ADDR_LEN;



	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	dev_addr_set(dev, (u8 *)&ax25_defaddr);

}



/*

drivers/net/hamradio/dmascc.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static void __init dev_setup(struct net_device *dev) 
	dev->addr_len = AX25_ADDR_LEN;

	dev->tx_queue_len = 64;

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);

	dev_addr_set(dev, (u8 *)&ax25_defaddr);

}



static const struct net_device_ops scc_netdev_ops = {

drivers/net/hamradio/hdlcdrv.c

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ static void hdlcdrv_setup(struct net_device *dev) 
	dev->mtu = AX25_DEF_PACLEN;        /* eth_mtu is the default */

	dev->addr_len = AX25_ADDR_LEN;     /* sizeof an ax.25 address */

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);

	dev_addr_set(dev, (u8 *)&ax25_defaddr);

	dev->tx_queue_len = 16;

}