[OpenWrt-Devel] [PATCH 2/2] generic: Allow configuring an increment with mtd-mac-address

Martin Blumenstingl martin.blumenstingl at googlemail.com
Sat Jun 27 18:12:49 EDT 2015


This is useful if the device also has an ethernet WAN interface with a
separate mac address (that is derived from the LAN mac address).

Signed-off-by: Martin Blumenstingl <martin.blumenstingl at googlemail.com>
---
 .../patches-3.18/681-NET-add-of_get_mac_address_mtd.patch    | 12 ++++++++----
 .../patches-4.0/681-NET-add-of_get_mac_address_mtd.patch     | 12 ++++++++----
 .../patches-4.1/681-NET-add-of_get_mac_address_mtd.patch     | 12 ++++++++----
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/target/linux/generic/patches-3.18/681-NET-add-of_get_mac_address_mtd.patch b/target/linux/generic/patches-3.18/681-NET-add-of_get_mac_address_mtd.patch
index bb3bf98..8ce17fe 100644
--- a/target/linux/generic/patches-3.18/681-NET-add-of_get_mac_address_mtd.patch
+++ b/target/linux/generic/patches-3.18/681-NET-add-of_get_mac_address_mtd.patch
@@ -23,12 +23,12 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
  
  /**
   * of_get_phy_mode - Get phy mode for given device_node
-@@ -75,3 +76,39 @@ const void *of_get_mac_address(struct de
+@@ -75,3 +76,43 @@ const void *of_get_mac_address(struct de
  	return NULL;
  }
  EXPORT_SYMBOL(of_get_mac_address);
 +
-+int of_get_mac_address_mtd(struct device_node *np, void *mac)
++int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac)
 +{
 +	struct device_node *mtd_np = NULL;
 +	size_t retlen;
@@ -37,6 +37,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	const char *part;
 +	const __be32 *list;
 +	phandle phandle;
++	u32 mac_inc = 0;
 +
 +	list = of_get_property(np, "mtd-mac-address", &size);
 +	if (!list || (size != (2 * sizeof(*list))))
@@ -57,9 +58,12 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	if (IS_ERR(mtd))
 +		return PTR_ERR(mtd);
 +
-+	ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, (u_char *) mac);
++	ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac);
 +	put_mtd_device(mtd);
 +
++	if (!of_property_read_u32(np, "mtd-mac-address-increment", &mac_inc))
++		mac[5] += mac_inc;
++
 +	return ret;
 +}
 +EXPORT_SYMBOL_GPL(of_get_mac_address_mtd);
@@ -69,7 +73,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
  #include <linux/of.h>
  extern int of_get_phy_mode(struct device_node *np);
  extern const void *of_get_mac_address(struct device_node *np);
-+extern int of_get_mac_address_mtd(struct device_node *np, void *mac);
++extern int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac);
  #else
  static inline int of_get_phy_mode(struct device_node *np)
  {
diff --git a/target/linux/generic/patches-4.0/681-NET-add-of_get_mac_address_mtd.patch b/target/linux/generic/patches-4.0/681-NET-add-of_get_mac_address_mtd.patch
index bb3bf98..8ce17fe 100644
--- a/target/linux/generic/patches-4.0/681-NET-add-of_get_mac_address_mtd.patch
+++ b/target/linux/generic/patches-4.0/681-NET-add-of_get_mac_address_mtd.patch
@@ -23,12 +23,12 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
  
  /**
   * of_get_phy_mode - Get phy mode for given device_node
-@@ -75,3 +76,39 @@ const void *of_get_mac_address(struct de
+@@ -75,3 +76,43 @@ const void *of_get_mac_address(struct de
  	return NULL;
  }
  EXPORT_SYMBOL(of_get_mac_address);
 +
-+int of_get_mac_address_mtd(struct device_node *np, void *mac)
++int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac)
 +{
 +	struct device_node *mtd_np = NULL;
 +	size_t retlen;
@@ -37,6 +37,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	const char *part;
 +	const __be32 *list;
 +	phandle phandle;
++	u32 mac_inc = 0;
 +
 +	list = of_get_property(np, "mtd-mac-address", &size);
 +	if (!list || (size != (2 * sizeof(*list))))
@@ -57,9 +58,12 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	if (IS_ERR(mtd))
 +		return PTR_ERR(mtd);
 +
-+	ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, (u_char *) mac);
++	ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac);
 +	put_mtd_device(mtd);
 +
++	if (!of_property_read_u32(np, "mtd-mac-address-increment", &mac_inc))
++		mac[5] += mac_inc;
++
 +	return ret;
 +}
 +EXPORT_SYMBOL_GPL(of_get_mac_address_mtd);
@@ -69,7 +73,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
  #include <linux/of.h>
  extern int of_get_phy_mode(struct device_node *np);
  extern const void *of_get_mac_address(struct device_node *np);
-+extern int of_get_mac_address_mtd(struct device_node *np, void *mac);
++extern int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac);
  #else
  static inline int of_get_phy_mode(struct device_node *np)
  {
diff --git a/target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch b/target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch
index fe3f04e..6542898 100644
--- a/target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch
+++ b/target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch
@@ -23,12 +23,12 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
  
  /**
   * of_get_phy_mode - Get phy mode for given device_node
-@@ -80,3 +81,39 @@ const void *of_get_mac_address(struct de
+@@ -80,3 +81,43 @@ const void *of_get_mac_address(struct de
  	return of_get_mac_addr(np, "address");
  }
  EXPORT_SYMBOL(of_get_mac_address);
 +
-+int of_get_mac_address_mtd(struct device_node *np, void *mac)
++int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac)
 +{
 +	struct device_node *mtd_np = NULL;
 +	size_t retlen;
@@ -37,6 +37,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	const char *part;
 +	const __be32 *list;
 +	phandle phandle;
++	u32 mac_inc = 0;
 +
 +	list = of_get_property(np, "mtd-mac-address", &size);
 +	if (!list || (size != (2 * sizeof(*list))))
@@ -57,9 +58,12 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	if (IS_ERR(mtd))
 +		return PTR_ERR(mtd);
 +
-+	ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, (u_char *) mac);
++	ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac);
 +	put_mtd_device(mtd);
 +
++	if (!of_property_read_u32(np, "mtd-mac-address-increment", &mac_inc))
++		mac[5] += mac_inc;
++
 +	return ret;
 +}
 +EXPORT_SYMBOL_GPL(of_get_mac_address_mtd);
@@ -69,7 +73,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
  struct net_device;
  extern int of_get_phy_mode(struct device_node *np);
  extern const void *of_get_mac_address(struct device_node *np);
-+extern int of_get_mac_address_mtd(struct device_node *np, void *mac);
++extern int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac);
  extern struct net_device *of_find_net_device_by_node(struct device_node *np);
  #else
  static inline int of_get_phy_mode(struct device_node *np)
-- 
2.4.4
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list