From 2ad9f05361c0beaa20792f0dbd3f7bec706eaece Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Mon, 13 Jun 2011 22:37:23 +0000
Subject: [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
---
 target/linux/lantiq/patches-2.6.32/200-mach-arv45xx.patch | 6 +++---
 target/linux/lantiq/patches-2.6.39/200-mach-arv45xx.patch | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'target/linux/lantiq')

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 26aa5fbf6a..983fe71cb2 100644
--- 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 a5fa58f1dc..12f7c0034a 100644
--- 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);
 +}
-- 
cgit v1.2.3