diff options
| author | John Crispin <john@openwrt.org> | 2015-07-07 13:44:27 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-07-07 13:44:27 +0000 |
| commit | b9463ce78639483d555c2dad20127ab7bd162414 (patch) | |
| tree | 53c5651dcb07dc7c36dd3c947a847628db363b68 /target/linux/generic/patches-3.18 | |
| parent | fa9e259729b7d236d58ec2af82e699909d41ea4c (diff) | |
| download | upstream-b9463ce78639483d555c2dad20127ab7bd162414.tar.gz upstream-b9463ce78639483d555c2dad20127ab7bd162414.tar.bz2 upstream-b9463ce78639483d555c2dad20127ab7bd162414.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>
SVN-Revision: 46220
Diffstat (limited to 'target/linux/generic/patches-3.18')
| -rw-r--r-- | target/linux/generic/patches-3.18/681-NET-add-of_get_mac_address_mtd.patch | 12 |
1 files changed, 8 insertions, 4 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 bb3bf98575..8ce17fe925 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@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@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> #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) { |