summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-13 22:37:23 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-13 22:37:23 +0000
commit00cb032d3c1a2f1c4c052109f193a388005b536d (patch)
tree57de59c830a04658e1a9a0aea9be15000259e474
parent85c173ef010e1b81a28ee2d8564d4c704a79d223 (diff)
[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
-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);
+}