diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2014-08-10 12:21:30 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2014-08-10 12:21:30 +0000 |
| commit | 7a3018b4b657c2d30a3e93934f2c4204d4e007e9 (patch) | |
| tree | 59686ff7711a0198fcdad9384910eaa05d145f32 /target/linux | |
| parent | 8dd6672941a399ae559a41beabb8764529907b99 (diff) | |
| download | upstream-7a3018b4b657c2d30a3e93934f2c4204d4e007e9.tar.gz upstream-7a3018b4b657c2d30a3e93934f2c4204d4e007e9.tar.bz2 upstream-7a3018b4b657c2d30a3e93934f2c4204d4e007e9.zip | |
brcm63xx: Fix fallback sprom il0mac
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42097 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
7 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch b/target/linux/brcm63xx/patches-3.14/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch index 8caf34fa83..450bc1d7d4 100644 --- a/target/linux/brcm63xx/patches-3.14/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch +++ b/target/linux/brcm63xx/patches-3.14/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch @@ -169,7 +169,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> + int ret = 0; + +#ifdef CONFIG_SSB_PCIHOST -+ memcpy(bcm63xx_sprom.et0mac, mac, ETH_ALEN); ++ memcpy(bcm63xx_sprom.il0mac, mac, ETH_ALEN); + memcpy(bcm63xx_sprom.et0mac, mac, ETH_ALEN); + memcpy(bcm63xx_sprom.et1mac, mac, ETH_ALEN); + diff --git a/target/linux/brcm63xx/patches-3.14/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch b/target/linux/brcm63xx/patches-3.14/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch index e2a9367e2d..bc35c25165 100644 --- a/target/linux/brcm63xx/patches-3.14/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch +++ b/target/linux/brcm63xx/patches-3.14/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch @@ -48,10 +48,10 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> int ret = 0; #ifdef CONFIG_SSB_PCIHOST -- memcpy(bcm63xx_sprom.et0mac, mac, ETH_ALEN); +- memcpy(bcm63xx_sprom.il0mac, mac, ETH_ALEN); - memcpy(bcm63xx_sprom.et0mac, mac, ETH_ALEN); - memcpy(bcm63xx_sprom.et1mac, mac, ETH_ALEN); -+ memcpy(bcm63xx_sprom.et0mac, data->mac_addr, ETH_ALEN); ++ memcpy(bcm63xx_sprom.il0mac, data->mac_addr, ETH_ALEN); + memcpy(bcm63xx_sprom.et0mac, data->mac_addr, ETH_ALEN); + memcpy(bcm63xx_sprom.et1mac, data->mac_addr, ETH_ALEN); diff --git a/target/linux/brcm63xx/patches-3.14/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch b/target/linux/brcm63xx/patches-3.14/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch index 336200216a..0c4a9be47d 100644 --- a/target/linux/brcm63xx/patches-3.14/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch +++ b/target/linux/brcm63xx/patches-3.14/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch @@ -45,7 +45,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> + return -EINVAL; + } + - memcpy(bcm63xx_sprom.et0mac, data->mac_addr, ETH_ALEN); + memcpy(bcm63xx_sprom.il0mac, data->mac_addr, ETH_ALEN); memcpy(bcm63xx_sprom.et0mac, data->mac_addr, ETH_ALEN); memcpy(bcm63xx_sprom.et1mac, data->mac_addr, ETH_ALEN); --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_fallback_sprom.h diff --git a/target/linux/brcm63xx/patches-3.14/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch b/target/linux/brcm63xx/patches-3.14/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch index 5844361d17..42502eb062 100644 --- a/target/linux/brcm63xx/patches-3.14/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch +++ b/target/linux/brcm63xx/patches-3.14/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch @@ -512,6 +512,6 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> + if (size > 0) + sprom_extract(&bcm63xx_sprom, template_sprom, size); + - memcpy(bcm63xx_sprom.et0mac, data->mac_addr, ETH_ALEN); + memcpy(bcm63xx_sprom.il0mac, data->mac_addr, ETH_ALEN); memcpy(bcm63xx_sprom.et0mac, data->mac_addr, ETH_ALEN); memcpy(bcm63xx_sprom.et1mac, data->mac_addr, ETH_ALEN); diff --git a/target/linux/brcm63xx/patches-3.14/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch b/target/linux/brcm63xx/patches-3.14/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch index 3bcaee6c76..6475f9fa24 100644 --- a/target/linux/brcm63xx/patches-3.14/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch +++ b/target/linux/brcm63xx/patches-3.14/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch @@ -106,7 +106,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> memcpy(&bcm63xx_sprom, &bcm63xx_default_sprom, sizeof(bcm63xx_sprom)); @@ -692,8 +711,19 @@ int __init bcm63xx_register_fallback_spr - memcpy(bcm63xx_sprom.et0mac, data->mac_addr, ETH_ALEN); + memcpy(bcm63xx_sprom.il0mac, data->mac_addr, ETH_ALEN); memcpy(bcm63xx_sprom.et0mac, data->mac_addr, ETH_ALEN); memcpy(bcm63xx_sprom.et1mac, data->mac_addr, ETH_ALEN); +#endif /* defined(CONFIG_SSB_PCIHOST) || defined(CONFIG_BCMA_HOST_PCI) */ diff --git a/target/linux/brcm63xx/patches-3.14/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch b/target/linux/brcm63xx/patches-3.14/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch index e74a62a77a..74c2846d5f 100644 --- a/target/linux/brcm63xx/patches-3.14/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch +++ b/target/linux/brcm63xx/patches-3.14/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch @@ -43,7 +43,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> sprom_extract(&bcm63xx_sprom, template_sprom, size); + } - memcpy(bcm63xx_sprom.et0mac, data->mac_addr, ETH_ALEN); + memcpy(bcm63xx_sprom.il0mac, data->mac_addr, ETH_ALEN); memcpy(bcm63xx_sprom.et0mac, data->mac_addr, ETH_ALEN); --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_fallback_sprom.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_fallback_sprom.h diff --git a/target/linux/brcm63xx/patches-3.14/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch b/target/linux/brcm63xx/patches-3.14/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch index 15c760ab9b..40591e5f2e 100644 --- a/target/linux/brcm63xx/patches-3.14/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch +++ b/target/linux/brcm63xx/patches-3.14/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch @@ -76,10 +76,10 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> + sprom_extract(&fallback_sprom.sprom, template_sprom, size); } -- memcpy(bcm63xx_sprom.et0mac, data->mac_addr, ETH_ALEN); +- memcpy(bcm63xx_sprom.il0mac, data->mac_addr, ETH_ALEN); - memcpy(bcm63xx_sprom.et0mac, data->mac_addr, ETH_ALEN); - memcpy(bcm63xx_sprom.et1mac, data->mac_addr, ETH_ALEN); -+ memcpy(fallback_sprom.sprom.et0mac, data->mac_addr, ETH_ALEN); ++ memcpy(fallback_sprom.sprom.il0mac, data->mac_addr, ETH_ALEN); + memcpy(fallback_sprom.sprom.et0mac, data->mac_addr, ETH_ALEN); + memcpy(fallback_sprom.sprom.et1mac, data->mac_addr, ETH_ALEN); + |