From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 5 Jul 2014 19:36:49 +0000 (+0000)
Subject: brcm47xx: increase fallback mac addresses by one
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=77dee19ab42af55252a2e84aff406f8a754e744d;p=openwrt%2Fstaging%2Fnbd.git

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 <hauke@hauke-m.de>

SVN-Revision: 41515
---

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)