Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Danny Kukawka <danny.kukawka@bisect.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Bob Liu <lliubbo@gmail.com>

authored by

Danny Kukawka and committed by
Bob Liu
0eceb82f dd47ba13

+26 -25
+2 -1
arch/blackfin/mach-bf518/boards/ezbrd.c
··· 821 821 bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); 822 822 } 823 823 824 - void bfin_get_ether_addr(char *addr) 824 + int bfin_get_ether_addr(char *addr) 825 825 { 826 826 /* the MAC is stored in OTP memory page 0xDF */ 827 827 u32 ret; ··· 834 834 for (ret = 0; ret < 6; ++ret) 835 835 addr[ret] = otp_mac_p[5 - ret]; 836 836 } 837 + return 0; 837 838 } 838 839 EXPORT_SYMBOL(bfin_get_ether_addr);
+2 -3
arch/blackfin/mach-bf518/boards/tcm-bf518.c
··· 730 730 bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); 731 731 } 732 732 733 - void bfin_get_ether_addr(char *addr) 733 + int bfin_get_ether_addr(char *addr) 734 734 { 735 - random_ether_addr(addr); 736 - printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__); 735 + return 1; 737 736 } 738 737 EXPORT_SYMBOL(bfin_get_ether_addr);
+2 -1
arch/blackfin/mach-bf527/boards/ad7160eval.c
··· 846 846 bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); 847 847 } 848 848 849 - void bfin_get_ether_addr(char *addr) 849 + int bfin_get_ether_addr(char *addr) 850 850 { 851 851 /* the MAC is stored in OTP memory page 0xDF */ 852 852 u32 ret; ··· 859 859 for (ret = 0; ret < 6; ++ret) 860 860 addr[ret] = otp_mac_p[5 - ret]; 861 861 } 862 + return 0; 862 863 } 863 864 EXPORT_SYMBOL(bfin_get_ether_addr);
+2 -3
arch/blackfin/mach-bf527/boards/cm_bf527.c
··· 983 983 bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); 984 984 } 985 985 986 - void bfin_get_ether_addr(char *addr) 986 + int bfin_get_ether_addr(char *addr) 987 987 { 988 - random_ether_addr(addr); 989 - printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__); 988 + return 1; 990 989 } 991 990 EXPORT_SYMBOL(bfin_get_ether_addr);
+2 -1
arch/blackfin/mach-bf527/boards/ezbrd.c
··· 870 870 bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); 871 871 } 872 872 873 - void bfin_get_ether_addr(char *addr) 873 + int bfin_get_ether_addr(char *addr) 874 874 { 875 875 /* the MAC is stored in OTP memory page 0xDF */ 876 876 u32 ret; ··· 883 883 for (ret = 0; ret < 6; ++ret) 884 884 addr[ret] = otp_mac_p[5 - ret]; 885 885 } 886 + return 0; 886 887 } 887 888 EXPORT_SYMBOL(bfin_get_ether_addr);
+2 -1
arch/blackfin/mach-bf527/boards/ezkit.c
··· 1311 1311 bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); 1312 1312 } 1313 1313 1314 - void bfin_get_ether_addr(char *addr) 1314 + int bfin_get_ether_addr(char *addr) 1315 1315 { 1316 1316 /* the MAC is stored in OTP memory page 0xDF */ 1317 1317 u32 ret; ··· 1324 1324 for (ret = 0; ret < 6; ++ret) 1325 1325 addr[ret] = otp_mac_p[5 - ret]; 1326 1326 } 1327 + return 0; 1327 1328 } 1328 1329 EXPORT_SYMBOL(bfin_get_ether_addr);
+2 -1
arch/blackfin/mach-bf527/boards/tll6527m.c
··· 931 931 bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); 932 932 } 933 933 934 - void bfin_get_ether_addr(char *addr) 934 + int bfin_get_ether_addr(char *addr) 935 935 { 936 936 /* the MAC is stored in OTP memory page 0xDF */ 937 937 u32 ret; ··· 945 945 for (ret = 0; ret < 6; ++ret) 946 946 addr[ret] = otp_mac_p[5 - ret]; 947 947 } 948 + return 0; 948 949 } 949 950 EXPORT_SYMBOL(bfin_get_ether_addr);
+2 -3
arch/blackfin/mach-bf537/boards/cm_bf537e.c
··· 813 813 ARRAY_SIZE(cm_bf537e_early_devices)); 814 814 } 815 815 816 - void bfin_get_ether_addr(char *addr) 816 + int bfin_get_ether_addr(char *addr) 817 817 { 818 - random_ether_addr(addr); 819 - printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__); 818 + return 1; 820 819 } 821 820 EXPORT_SYMBOL(bfin_get_ether_addr);
+2 -3
arch/blackfin/mach-bf537/boards/cm_bf537u.c
··· 790 790 ARRAY_SIZE(cm_bf537u_early_devices)); 791 791 } 792 792 793 - void bfin_get_ether_addr(char *addr) 793 + int bfin_get_ether_addr(char *addr) 794 794 { 795 - random_ether_addr(addr); 796 - printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__); 795 + return 1; 797 796 } 798 797 EXPORT_SYMBOL(bfin_get_ether_addr);
+2 -1
arch/blackfin/mach-bf537/boards/dnp5370.c
··· 399 399 /* 400 400 * Currently the MAC address is saved in Flash by U-Boot 401 401 */ 402 - void bfin_get_ether_addr(char *addr) 402 + int bfin_get_ether_addr(char *addr) 403 403 { 404 404 *(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC); 405 405 *(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4); 406 + return 0; 406 407 } 407 408 EXPORT_SYMBOL(bfin_get_ether_addr);
+2 -3
arch/blackfin/mach-bf537/boards/pnav10.c
··· 535 535 ARRAY_SIZE(stamp_early_devices)); 536 536 } 537 537 538 - void bfin_get_ether_addr(char *addr) 538 + int bfin_get_ether_addr(char *addr) 539 539 { 540 - random_ether_addr(addr); 541 - printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__); 540 + return 1; 542 541 } 543 542 EXPORT_SYMBOL(bfin_get_ether_addr);
+2 -1
arch/blackfin/mach-bf537/boards/stamp.c
··· 3013 3013 * Currently the MAC address is saved in Flash by U-Boot 3014 3014 */ 3015 3015 #define FLASH_MAC 0x203f0000 3016 - void bfin_get_ether_addr(char *addr) 3016 + int bfin_get_ether_addr(char *addr) 3017 3017 { 3018 3018 *(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC); 3019 3019 *(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4); 3020 + return 0; 3020 3021 } 3021 3022 EXPORT_SYMBOL(bfin_get_ether_addr);
+2 -3
arch/blackfin/mach-bf537/boards/tcm_bf537.c
··· 780 780 ARRAY_SIZE(cm_bf537_early_devices)); 781 781 } 782 782 783 - void bfin_get_ether_addr(char *addr) 783 + int bfin_get_ether_addr(char *addr) 784 784 { 785 - random_ether_addr(addr); 786 - printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__); 785 + return 1; 787 786 } 788 787 EXPORT_SYMBOL(bfin_get_ether_addr);