[lantiq]

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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27172 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 26aa5fb..983fe71 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
 +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);
 +}
 +              (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
 +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);
 +}
 +              (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
 +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);
 +}
 +              (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 a5fa58f..12f7c00 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
 +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);
 +}
 +              (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
 +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);
 +}
 +              (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
 +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);
 +}
 +              (void *)KSEG1ADDR(LTQ_FLASH_START + BEWAN_BRN_MAC), 6);
 +      ltq_register_etop(&ltq_eth_data);
 +}