diff options
author | Jonas Gorski <jogo@openwrt.org> | 2013-06-30 13:09:50 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2013-06-30 13:09:50 +0000 |
commit | 66f8f30f473eebdf2c36b5b4841ab23fb53726c7 (patch) | |
tree | b8f2a4d30a0d804f47566dd7db0bba1f3879ccc7 /target/linux/brcm63xx/patches-3.9/426-hcs_mac_addr_pool.patch | |
parent | 12c033dfd90659fe6c4b7dc44cc91824be07c877 (diff) | |
download | upstream-66f8f30f473eebdf2c36b5b4841ab23fb53726c7.tar.gz upstream-66f8f30f473eebdf2c36b5b4841ab23fb53726c7.tar.bz2 upstream-66f8f30f473eebdf2c36b5b4841ab23fb53726c7.zip |
bcm63xx: update patches
Update patches with their upstream versions.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 37098
Diffstat (limited to 'target/linux/brcm63xx/patches-3.9/426-hcs_mac_addr_pool.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.9/426-hcs_mac_addr_pool.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/target/linux/brcm63xx/patches-3.9/426-hcs_mac_addr_pool.patch b/target/linux/brcm63xx/patches-3.9/426-hcs_mac_addr_pool.patch deleted file mode 100644 index 364bf48928..0000000000 --- a/target/linux/brcm63xx/patches-3.9/426-hcs_mac_addr_pool.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/arch/mips/bcm63xx/nvram.c -+++ b/arch/mips/bcm63xx/nvram.c -@@ -45,6 +45,7 @@ void __init bcm63xx_nvram_init(void *add - { - unsigned int check_len; - u32 crc, expected_crc; -+ u8 hcs_mac_addr[ETH_ALEN] = { 0x00, 0x10, 0x18, 0xff, 0xff, 0xff }; - - /* extract nvram data */ - memcpy(&nvram, addr, sizeof(nvram)); -@@ -65,6 +66,15 @@ void __init bcm63xx_nvram_init(void *add - if (crc != expected_crc) - pr_warn("nvram checksum failed, contents may be invalid (expected %08x, got %08x)\n", - expected_crc, crc); -+ -+ /* Cable modems have a different NVRAM which is embedded in the eCos -+ * firmware and not easily extractible, give at least a MAC address -+ * pool. -+ */ -+ if (BCMCPU_IS_3368()) { -+ memcpy(nvram.mac_addr_base, hcs_mac_addr, ETH_ALEN); -+ nvram.mac_addr_count = 2; -+ } - } - - u8 *bcm63xx_nvram_get_name(void) |