hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ar71xx: dir-825-b1: use ath79_parse_ascii_mac helper 

Remove the local MAC address parser function and use
the generic one instead.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38087 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Gabor Juhos 2013-09-20 16:41:32 +00:00
parent 40776d159d
commit 0097945adf
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-b1.c
View File

@ -113,18 +113,6 @@ static struct platform_device dir825b1_rtl8366s_device = {
}
};
static void dir825b1_read_ascii_mac(u8 *dest, u8 *src)
{
int ret;
ret = sscanf(src, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
&dest[0], &dest[1], &dest[2],
&dest[3], &dest[4], &dest[5]);
if (ret != ETH_ALEN)
memset(dest, 0, ETH_ALEN);
}
static bool __init dir825b1_is_caldata_valid(u8 *p)
{
u16 *magic0, *magic1;
@ -150,8 +138,8 @@ static void __init dir825b1_wlan_init(void)
}
}
dir825b1_read_ascii_mac(mac0, caldata + DIR825B1_MAC0_OFFSET);
dir825b1_read_ascii_mac(mac1, caldata + DIR825B1_MAC1_OFFSET);
ath79_parse_ascii_mac(caldata + DIR825B1_MAC0_OFFSET, mac0);
ath79_parse_ascii_mac(caldata + DIR825B1_MAC1_OFFSET, mac1);
ath79_init_mac(ath79_eth0_data.mac_addr, mac0, 0);
ath79_init_mac(ath79_eth1_data.mac_addr, mac1, 0);