From 8b6ffc15ec6d366114e91edee6157391d4393b4c Mon Sep 17 00:00:00 2001 From: hauke Date: Sat, 5 Jul 2014 19:36:49 +0000 Subject: [PATCH] brcm47xx: increase fallback mac addresses by one Now the mac address is increased by two for the first fallback mac address. It could be that the address increased should be used for the wan port. Signed-off-by: Hauke Mehrtens git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41515 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm47xx/patches-3.10/180-generate-mac-address.patch | 4 ++-- target/linux/brcm47xx/patches-3.14/180-generate-mac-address.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/brcm47xx/patches-3.10/180-generate-mac-address.patch b/target/linux/brcm47xx/patches-3.10/180-generate-mac-address.patch index 58112ce7f1..9ba9bb231f 100644 --- a/target/linux/brcm47xx/patches-3.10/180-generate-mac-address.patch +++ b/target/linux/brcm47xx/patches-3.10/180-generate-mac-address.patch @@ -14,7 +14,7 @@ +static bool bcm47xx_is_valid_mac(u8 *mac) +{ -+ return !(mac[0] == 0x00 && mac[1] == 0x90 && mac[2] == 0x4c); ++ return mac && !(mac[0] == 0x00 && mac[1] == 0x90 && mac[2] == 0x4c); +} + +static int bcm47xx_increase_mac_addr(u8 *mac, u8 num) @@ -37,7 +37,7 @@ + return 0; +} + -+static int mac_addr_used = 1; ++static int mac_addr_used = 2; + static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom, const char *prefix, bool fallback) diff --git a/target/linux/brcm47xx/patches-3.14/180-generate-mac-address.patch b/target/linux/brcm47xx/patches-3.14/180-generate-mac-address.patch index 58112ce7f1..9ba9bb231f 100644 --- a/target/linux/brcm47xx/patches-3.14/180-generate-mac-address.patch +++ b/target/linux/brcm47xx/patches-3.14/180-generate-mac-address.patch @@ -14,7 +14,7 @@ +static bool bcm47xx_is_valid_mac(u8 *mac) +{ -+ return !(mac[0] == 0x00 && mac[1] == 0x90 && mac[2] == 0x4c); ++ return mac && !(mac[0] == 0x00 && mac[1] == 0x90 && mac[2] == 0x4c); +} + +static int bcm47xx_increase_mac_addr(u8 *mac, u8 num) @@ -37,7 +37,7 @@ + return 0; +} + -+static int mac_addr_used = 1; ++static int mac_addr_used = 2; + static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom, const char *prefix, bool fallback) -- 2.11.0