Commit 76660757 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

ethernet: constify references to netdev->dev_addr in drivers 

This big patch sprinkles const on local variables and
function arguments which may refer to netdev->dev_addr.

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.

Some of the changes here are not strictly required - const
is sometimes cast off but pointer is not used for writing.
It seems like it's still better to add the const in case
the code changes later or relevant -W flags get enabled
for the build.

No functional changes.

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 201f1a2d

drivers/net/ethernet/actions/owl-emac.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static u32 owl_emac_dma_cmd_stop(struct owl_emac_priv *priv) 
static void owl_emac_set_hw_mac_addr(struct net_device *netdev)

{

	struct owl_emac_priv *priv = netdev_priv(netdev);

	u8 *mac_addr = netdev->dev_addr;

	const u8 *mac_addr = netdev->dev_addr;

	u32 addr_high, addr_low;



	addr_high = mac_addr[0] << 8 | mac_addr[1];

drivers/net/ethernet/adaptec/starfire.c

+5 −5
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ static int netdev_open(struct net_device *dev) 
	writew(0, ioaddr + PerfFilterTable + 4);

	writew(0, ioaddr + PerfFilterTable + 8);

	for (i = 1; i < 16; i++) {

		__be16 *eaddrs = (__be16 *)dev->dev_addr;

		const __be16 *eaddrs = (const __be16 *)dev->dev_addr;

		void __iomem *setup_frm = ioaddr + PerfFilterTable + i * 16;

		writew(be16_to_cpu(eaddrs[2]), setup_frm); setup_frm += 4;

		writew(be16_to_cpu(eaddrs[1]), setup_frm); setup_frm += 4;
@@ -1787,14 +1787,14 @@ static void set_rx_mode(struct net_device *dev) 
	} else if (netdev_mc_count(dev) <= 14) {

		/* Use the 16 element perfect filter, skip first two entries. */

		void __iomem *filter_addr = ioaddr + PerfFilterTable + 2 * 16;

		__be16 *eaddrs;

		const __be16 *eaddrs;

		netdev_for_each_mc_addr(ha, dev) {

			eaddrs = (__be16 *) ha->addr;

			writew(be16_to_cpu(eaddrs[2]), filter_addr); filter_addr += 4;

			writew(be16_to_cpu(eaddrs[1]), filter_addr); filter_addr += 4;

			writew(be16_to_cpu(eaddrs[0]), filter_addr); filter_addr += 8;

		}

		eaddrs = (__be16 *)dev->dev_addr;

		eaddrs = (const __be16 *)dev->dev_addr;

		i = netdev_mc_count(dev) + 2;

		while (i++ < 16) {

			writew(be16_to_cpu(eaddrs[0]), filter_addr); filter_addr += 4;
@@ -1805,7 +1805,7 @@ static void set_rx_mode(struct net_device *dev) 
	} else {

		/* Must use a multicast hash table. */

		void __iomem *filter_addr;

		__be16 *eaddrs;

		const __be16 *eaddrs;

		__le16 mc_filter[32] __attribute__ ((aligned(sizeof(long))));	/* Multicast hash filter */



		memset(mc_filter, 0, sizeof(mc_filter));
@@ -1819,7 +1819,7 @@ static void set_rx_mode(struct net_device *dev) 
		}

		/* Clear the perfect filter list, skip first two entries. */

		filter_addr = ioaddr + PerfFilterTable + 2 * 16;

		eaddrs = (__be16 *)dev->dev_addr;

		eaddrs = (const __be16 *)dev->dev_addr;

		for (i = 2; i < 16; i++) {

			writew(be16_to_cpu(eaddrs[0]), filter_addr); filter_addr += 4;

			writew(be16_to_cpu(eaddrs[1]), filter_addr); filter_addr += 4;

drivers/net/ethernet/alacritech/slicoss.c

+1 −1
Original line number Diff line number Diff line
@@ -1008,7 +1008,7 @@ static void slic_set_link_autoneg(struct slic_device *sdev) 


static void slic_set_mac_address(struct slic_device *sdev)

{

	u8 *addr = sdev->netdev->dev_addr;

	const u8 *addr = sdev->netdev->dev_addr;

	u32 val;



	val = addr[5] | addr[4] << 8 | addr[3] << 16 | addr[2] << 24;

drivers/net/ethernet/alteon/acenic.c

+2 −2
Original line number Diff line number Diff line
@@ -2712,7 +2712,7 @@ static int ace_set_mac_addr(struct net_device *dev, void *p) 
	struct ace_private *ap = netdev_priv(dev);

	struct ace_regs __iomem *regs = ap->regs;

	struct sockaddr *addr=p;

	u8 *da;

	const u8 *da;

	struct cmd cmd;



	if(netif_running(dev))
@@ -2720,7 +2720,7 @@ static int ace_set_mac_addr(struct net_device *dev, void *p) 


	eth_hw_addr_set(dev, addr->sa_data);



	da = (u8 *)dev->dev_addr;

	da = (const u8 *)dev->dev_addr;



	writel(da[0] << 8 | da[1], &regs->MacAddrHi);

	writel((da[2] << 24) | (da[3] << 16) | (da[4] << 8) | da[5],

drivers/net/ethernet/altera/altera_tse_main.c

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static int init_phy(struct net_device *dev) 
	return 0;

}



static void tse_update_mac_addr(struct altera_tse_private *priv, u8 *addr)

static void tse_update_mac_addr(struct altera_tse_private *priv, const u8 *addr)

{

	u32 msb;

	u32 lsb;