diff options
| author | John Crispin <blogic@openwrt.org> | 2015-07-07 13:44:27 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-07-07 13:44:27 +0000 |
| commit | db0c1b56a00f431929aa0da58ea6bfe02a504607 (patch) | |
| tree | 358b09d58fa70eb5fe4efb5ae77a1f65b2990e57 /target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch | |
| parent | 3441eefc5b607c6e4012ffbebfbb41f44864d1a6 (diff) | |
| download | master-187ad058-db0c1b56a00f431929aa0da58ea6bfe02a504607.tar.gz master-187ad058-db0c1b56a00f431929aa0da58ea6bfe02a504607.tar.bz2 master-187ad058-db0c1b56a00f431929aa0da58ea6bfe02a504607.zip | |
generic: Allow configuring an increment with mtd-mac-address
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@googlemail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46220 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch')
| -rw-r--r-- | target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch | 12 |
1 files changed, 8 insertions, 4 deletions
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 fe3f04ed37..65428981ec 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@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@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@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@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) |