Fix for bug where the iniatialisation of the MAC data private strucure

is copied into the wrong location.

Ticket #9547

Signed-off-by: Conor O'Gorman <conor at dna.ie>

SVN-Revision: 27172
lede-17.01
John Crispin 2011-06-13 22:37:23 +00:00
parent 471c8077ee
commit 0732b2db78
2 changed files with 6 additions and 6 deletions

View File

@ -276,7 +276,7 @@
+arv45xx_register_ethernet(void) +arv45xx_register_ethernet(void)
+{ +{
+#define ARV45XX_BRN_MAC 0x3f0016 +#define ARV45XX_BRN_MAC 0x3f0016
+ memcpy_fromio(&ltq_eth_data.mac, + memcpy_fromio(&ltq_eth_data.mac.sa_data,
+ (void *)KSEG1ADDR(LTQ_FLASH_START + ARV45XX_BRN_MAC), 6); + (void *)KSEG1ADDR(LTQ_FLASH_START + ARV45XX_BRN_MAC), 6);
+ ltq_register_etop(&ltq_eth_data); + ltq_register_etop(&ltq_eth_data);
+} +}
@ -285,7 +285,7 @@
+arv75xx_register_ethernet(void) +arv75xx_register_ethernet(void)
+{ +{
+#define ARV75XX_BRN_MAC 0x7f0016 +#define ARV75XX_BRN_MAC 0x7f0016
+ memcpy_fromio(&ltq_eth_data.mac, + memcpy_fromio(&ltq_eth_data.mac.sa_data,
+ (void *)KSEG1ADDR(LTQ_FLASH_START + ARV75XX_BRN_MAC), 6); + (void *)KSEG1ADDR(LTQ_FLASH_START + ARV75XX_BRN_MAC), 6);
+ ltq_register_etop(&ltq_eth_data); + ltq_register_etop(&ltq_eth_data);
+} +}
@ -294,7 +294,7 @@
+bewan_register_ethernet(void) +bewan_register_ethernet(void)
+{ +{
+#define BEWAN_BRN_MAC 0x3f0014 +#define BEWAN_BRN_MAC 0x3f0014
+ memcpy_fromio(&ltq_eth_data.mac, + memcpy_fromio(&ltq_eth_data.mac.sa_data,
+ (void *)KSEG1ADDR(LTQ_FLASH_START + BEWAN_BRN_MAC), 6); + (void *)KSEG1ADDR(LTQ_FLASH_START + BEWAN_BRN_MAC), 6);
+ ltq_register_etop(&ltq_eth_data); + ltq_register_etop(&ltq_eth_data);
+} +}

View File

@ -276,7 +276,7 @@
+arv45xx_register_ethernet(void) +arv45xx_register_ethernet(void)
+{ +{
+#define ARV45XX_BRN_MAC 0x3f0016 +#define ARV45XX_BRN_MAC 0x3f0016
+ memcpy_fromio(&ltq_eth_data.mac, + memcpy_fromio(&ltq_eth_data.mac.sa_data,
+ (void *)KSEG1ADDR(LTQ_FLASH_START + ARV45XX_BRN_MAC), 6); + (void *)KSEG1ADDR(LTQ_FLASH_START + ARV45XX_BRN_MAC), 6);
+ ltq_register_etop(&ltq_eth_data); + ltq_register_etop(&ltq_eth_data);
+} +}
@ -285,7 +285,7 @@
+arv75xx_register_ethernet(void) +arv75xx_register_ethernet(void)
+{ +{
+#define ARV75XX_BRN_MAC 0x7f0016 +#define ARV75XX_BRN_MAC 0x7f0016
+ memcpy_fromio(&ltq_eth_data.mac, + memcpy_fromio(&ltq_eth_data.mac.sa_data,
+ (void *)KSEG1ADDR(LTQ_FLASH_START + ARV75XX_BRN_MAC), 6); + (void *)KSEG1ADDR(LTQ_FLASH_START + ARV75XX_BRN_MAC), 6);
+ ltq_register_etop(&ltq_eth_data); + ltq_register_etop(&ltq_eth_data);
+} +}
@ -294,7 +294,7 @@
+bewan_register_ethernet(void) +bewan_register_ethernet(void)
+{ +{
+#define BEWAN_BRN_MAC 0x3f0014 +#define BEWAN_BRN_MAC 0x3f0014
+ memcpy_fromio(&ltq_eth_data.mac, + memcpy_fromio(&ltq_eth_data.mac.sa_data,
+ (void *)KSEG1ADDR(LTQ_FLASH_START + BEWAN_BRN_MAC), 6); + (void *)KSEG1ADDR(LTQ_FLASH_START + BEWAN_BRN_MAC), 6);
+ ltq_register_etop(&ltq_eth_data); + ltq_register_etop(&ltq_eth_data);
+} +}