diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2014-07-13 19:43:54 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2014-07-13 19:43:54 +0000 |
| commit | a4ddc932a3f648762cdaa8e92086d1dfba83d2fe (patch) | |
| tree | 3ba002c8a67869df3171df4368c8f5e39d9b889a | |
| parent | cd2257abac4f10b1b5595f73c370bab79e8e8a7a (diff) | |
| download | upstream-a4ddc932a3f648762cdaa8e92086d1dfba83d2fe.tar.gz upstream-a4ddc932a3f648762cdaa8e92086d1dfba83d2fe.tar.bz2 upstream-a4ddc932a3f648762cdaa8e92086d1dfba83d2fe.zip | |
ar71xx: allow ath79_nvram_parse_mac_addr parsing mac with quotes
Signed-off-by: Jon Suphammer <jon@suphammer.net>
Patchwork: http://patchwork.openwrt.org/patch/5838/
[juhosg:
- fix coding style,
- check the first and the last character of the MAC string
instead of using the strchr() function]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41622 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/nvram.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/nvram.c b/target/linux/ar71xx/files/arch/mips/ath79/nvram.c index 43911b8ac1..e55af5abe2 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/nvram.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/nvram.c @@ -59,6 +59,11 @@ int ath79_nvram_parse_mac_addr(const char *nvram, unsigned nvram_len, goto free; } + if (strlen(mac_str) == 19 && mac_str[0] == '"' && mac_str[18] == '"') { + mac_str[18] = 0; + mac_str++; + } + t = sscanf(mac_str, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]); |