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

Commit fa63c6da authored by Danny Kukawka's avatar Danny Kukawka Committed by David S. Miller
Browse files

arch/blackfin: don't generate random mac in bfin_get_ether_addr() 



Changed bfin_get_ether_addr() to return a state and to
set no random mac address if the board don't provide one.

Let the caller of bfin_get_ether_addr() set a random mac
address if the return value is not 0.

v2: don't set random mac in bfin_get_ether_addr()

Signed-off-by: default avatarDanny Kukawka <danny.kukawka@bisect.de>
Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 772301b6

arch/blackfin/mach-bf518/boards/ezbrd.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -821,7 +821,7 @@ void native_machine_restart(char *cmd) 
		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);

		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);

}

}





void bfin_get_ether_addr(char *addr)

int bfin_get_ether_addr(char *addr)

{

{

	/* the MAC is stored in OTP memory page 0xDF */

	/* the MAC is stored in OTP memory page 0xDF */

	u32 ret;

	u32 ret;
@@ -834,5 +834,6 @@ void bfin_get_ether_addr(char *addr) 
		for (ret = 0; ret < 6; ++ret)

		for (ret = 0; ret < 6; ++ret)

			addr[ret] = otp_mac_p[5 - ret];

			addr[ret] = otp_mac_p[5 - ret];

	}

	}

	return 0;

}

}

EXPORT_SYMBOL(bfin_get_ether_addr);
 
EXPORT_SYMBOL(bfin_get_ether_addr);

arch/blackfin/mach-bf518/boards/tcm-bf518.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -730,9 +730,8 @@ void native_machine_restart(char *cmd) 
		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);

		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);

}

}





void bfin_get_ether_addr(char *addr)

int bfin_get_ether_addr(char *addr)

{

{

	random_ether_addr(addr);

	return 1;

	printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);

}

}

EXPORT_SYMBOL(bfin_get_ether_addr);
 
EXPORT_SYMBOL(bfin_get_ether_addr);

arch/blackfin/mach-bf527/boards/ad7160eval.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -846,7 +846,7 @@ void native_machine_restart(char *cmd) 
		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);

		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);

}

}





void bfin_get_ether_addr(char *addr)

int bfin_get_ether_addr(char *addr)

{

{

	/* the MAC is stored in OTP memory page 0xDF */

	/* the MAC is stored in OTP memory page 0xDF */

	u32 ret;

	u32 ret;
@@ -859,5 +859,6 @@ void bfin_get_ether_addr(char *addr) 
		for (ret = 0; ret < 6; ++ret)

		for (ret = 0; ret < 6; ++ret)

			addr[ret] = otp_mac_p[5 - ret];

			addr[ret] = otp_mac_p[5 - ret];

	}

	}

	return 0;

}

}

EXPORT_SYMBOL(bfin_get_ether_addr);
 
EXPORT_SYMBOL(bfin_get_ether_addr);

arch/blackfin/mach-bf527/boards/cm_bf527.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -983,9 +983,8 @@ void native_machine_restart(char *cmd) 
		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);

		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);

}

}





void bfin_get_ether_addr(char *addr)

int bfin_get_ether_addr(char *addr)

{

{

	random_ether_addr(addr);

	return 1;

	printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);

}

}

EXPORT_SYMBOL(bfin_get_ether_addr);
 
EXPORT_SYMBOL(bfin_get_ether_addr);

arch/blackfin/mach-bf527/boards/ezbrd.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -870,7 +870,7 @@ void native_machine_restart(char *cmd) 
		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);

		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);

}

}





void bfin_get_ether_addr(char *addr)

int bfin_get_ether_addr(char *addr)

{

{

	/* the MAC is stored in OTP memory page 0xDF */

	/* the MAC is stored in OTP memory page 0xDF */

	u32 ret;

	u32 ret;
@@ -883,5 +883,6 @@ void bfin_get_ether_addr(char *addr) 
		for (ret = 0; ret < 6; ++ret)

		for (ret = 0; ret < 6; ++ret)

			addr[ret] = otp_mac_p[5 - ret];

			addr[ret] = otp_mac_p[5 - ret];

	}

	}

	return 0;

}

}

EXPORT_SYMBOL(bfin_get_ether_addr);
 
EXPORT_SYMBOL(bfin_get_ether_addr);