aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2011-06-13 22:37:23 +0000
committerJohn Crispin <john@openwrt.org>2011-06-13 22:37:23 +0000
commit0732b2db785e77c0c06904eab4014c643425f6a3 (patch)
tree04c038dd32e9a122cc75257ded77ff93ad36768d /target
parent471c8077ee2197f8365822ba359a7b74f8821e31 (diff)
downloadupstream-0732b2db785e77c0c06904eab4014c643425f6a3.tar.gz
upstream-0732b2db785e77c0c06904eab4014c643425f6a3.tar.bz2
upstream-0732b2db785e77c0c06904eab4014c643425f6a3.zip
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
Diffstat (limited to 'target')
-rw-r--r--target/linux/lantiq/patches-2.6.32/200-mach-arv45xx.patch6
-rw-r--r--target/linux/lantiq/patches-2.6.39/200-mach-arv45xx.patch6
2 files changed, 6 insertions, 6 deletions
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);
+}