diff options
author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-12-19 23:26:15 +0000 |
---|---|---|
committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-12-19 23:26:15 +0000 |
commit | 84ddb1a86303e4ff6028720c877bd0d5f9ec9a2a (patch) | |
tree | cc44809678c24bfb67bff821eae2f2084402dfe4 /target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch | |
parent | a3a1d16c4477398af95571971c4053295c4487cf (diff) |
brcm47xx: remove support for kernel 2.6.39
There are problems with the patches for kernel 2.6.39 and I do not want to support two different sets of patches.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29573 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch b/target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch deleted file mode 100644 index 17d4ed610..000000000 --- a/target/linux/brcm47xx/patches-2.6.39/018-wgt634u_mac_address_parser_fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/arch/mips/include/asm/mach-bcm47xx/nvram.h -+++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h -@@ -39,8 +39,15 @@ extern int nvram_getenv(char *name, char - - static inline void nvram_parse_macaddr(char *buf, u8 *macaddr) - { -- sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0], &macaddr[1], -- &macaddr[2], &macaddr[3], &macaddr[4], &macaddr[5]); -+ if (strchr(buf, ':')) { -+ sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0], &macaddr[1], -+ &macaddr[2], &macaddr[3], &macaddr[4], &macaddr[5]); -+ } else if (strchr(buf, '-')) { -+ sscanf(buf, "%hhx-%hhx-%hhx-%hhx-%hhx-%hhx", &macaddr[0], &macaddr[1], -+ &macaddr[2], &macaddr[3], &macaddr[4], &macaddr[5]); -+ } else { -+ printk(KERN_WARNING "Can not parse mac address: %s\n", buf); -+ } - } - - #endif |