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

diff --git a/target/linux/lantiq/patches-2.6.32/200-mach-arv45xx.patch b/target/linux/lantiq/patches-2.6.32/200-mach-arv45xx.patch
index 26aa5fbf6a2d1252d4b7275fbe844dfd30fdfcfa..983fe71cb27cced6582d18054560e2b4f73ec9cf 100644 (file)
--- a/target/linux/lantiq/patches-2.6.32/200-mach-arv45xx.patch
+++ b/target/linux/lantiq/patches-2.6.32/200-mach-arv45xx.patch
@@ -276,7 +276,7 @@
 +arv45xx_register_ethernet(void)
 +{
 +#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);
 +      ltq_register_etop(&ltq_eth_data);
 +}
@@ -285,7 +285,7 @@
 +arv75xx_register_ethernet(void)
 +{
 +#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);
 +      ltq_register_etop(&ltq_eth_data);
 +}
@@ -294,7 +294,7 @@
 +bewan_register_ethernet(void)
 +{
 +#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);
 +      ltq_register_etop(&ltq_eth_data);
 +}

diff --git a/target/linux/lantiq/patches-2.6.39/200-mach-arv45xx.patch b/target/linux/lantiq/patches-2.6.39/200-mach-arv45xx.patch
index a5fa58f1dc1747fac24b36de9cd678d2c0e37ed2..12f7c0034a7a53053fd5d3cbd91a3dfbcd725671 100644 (file)
--- a/target/linux/lantiq/patches-2.6.39/200-mach-arv45xx.patch
+++ b/target/linux/lantiq/patches-2.6.39/200-mach-arv45xx.patch
@@ -276,7 +276,7 @@
 +arv45xx_register_ethernet(void)
 +{
 +#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);
 +      ltq_register_etop(&ltq_eth_data);
 +}
@@ -285,7 +285,7 @@
 +arv75xx_register_ethernet(void)
 +{
 +#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);
 +      ltq_register_etop(&ltq_eth_data);
 +}
@@ -294,7 +294,7 @@
 +bewan_register_ethernet(void)
 +{
 +#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);
 +      ltq_register_etop(&ltq_eth_data);
 +}