KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

atheros: update ether addresses handling

Browse source 
- use ether_foo() routines to work with addresses
 - use ETH_ALEN inplace of magic '6'

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

SVN-Revision: 42494
This commit is contained in:
John Crispin 2014-09-12 06:52:21 +00:00
parent bdc1357e7b
commit 98b6a56b3c
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
target/linux/atheros/patches-3.14/100-board.patch
View file

@ -84,7 +84,7 @@
+obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o +obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
--- /dev/null --- /dev/null
+++ b/arch/mips/ar231x/board.c +++ b/arch/mips/ar231x/board.c
@@ -0,0 +1,263 @@ @@ -0,0 +1,260 @@
+/* +/*
+ * This file is subject to the terms and conditions of the GNU General Public + * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive + * License. See the file "COPYING" in the main directory of this archive
@ -255,7 +255,7 @@
+ if (broken_boarddata) { + if (broken_boarddata) {
+ pr_warn("WARNING: broken board data detected\n"); + pr_warn("WARNING: broken board data detected\n");
+ config = ar231x_board.config; + config = ar231x_board.config;
+ if (!memcmp(config->enet0_mac, "\x00\x00\x00\x00\x00\x00", 6)) { + if (is_zero_ether_addr(config->enet0_mac)) {
+ pr_info("Fixing up empty mac addresses\n"); + pr_info("Fixing up empty mac addresses\n");
+ config->reset_config_gpio = 0xffff; + config->reset_config_gpio = 0xffff;
+ config->sys_led_gpio = 0xffff; + config->sys_led_gpio = 0xffff;
@ -266,7 +266,6 @@
+ } + }
+ } + }
+ +
+
+ /* Radio config starts 0x100 bytes after board config, regardless + /* Radio config starts 0x100 bytes after board config, regardless
+ * of what the physical layout on the flash chip looks like */ + * of what the physical layout on the flash chip looks like */
+ +
@ -289,7 +288,7 @@
+ mac_addr = &radio_data[0x1d * 2]; + mac_addr = &radio_data[0x1d * 2];
+ if (is_broadcast_ether_addr(mac_addr)) { + if (is_broadcast_ether_addr(mac_addr)) {
+ pr_info("Radio MAC is blank; using board-data\n"); + pr_info("Radio MAC is blank; using board-data\n");
+ memcpy(mac_addr, ar231x_board.config->wlan0_mac, ETH_ALEN); + ether_addr_copy(mac_addr, ar231x_board.config->wlan0_mac);
+ } + }
+ +
+ return 0; + return 0;
@ -316,7 +315,6 @@
+ write_c0_watchlo0(0); + write_c0_watchlo0(0);
+} +}
+ +
+
+asmlinkage void +asmlinkage void
+plat_irq_dispatch(void) +plat_irq_dispatch(void)
+{ +{
@ -347,7 +345,6 @@
+ ar2315_irq_init(); + ar2315_irq_init();
+} +}
+ +
+
--- /dev/null --- /dev/null
+++ b/arch/mips/ar231x/prom.c +++ b/arch/mips/ar231x/prom.c
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
@ -390,10 +387,12 @@
+} +}
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/mach-ar231x/ar231x_platform.h +++ b/arch/mips/include/asm/mach-ar231x/ar231x_platform.h
@@ -0,0 +1,83 @@ @@ -0,0 +1,85 @@
+#ifndef __ASM_MACH_AR231X_PLATFORM_H +#ifndef __ASM_MACH_AR231X_PLATFORM_H
+#define __ASM_MACH_AR231X_PLATFORM_H +#define __ASM_MACH_AR231X_PLATFORM_H
+ +
+#include <linux/etherdevice.h>
+
+/* +/*
+ * This is board-specific data that is stored in a "fixed" location in flash. + * This is board-specific data that is stored in a "fixed" location in flash.
+ * It is shared across operating systems, so it should not be changed lightly. + * It is shared across operating systems, so it should not be changed lightly.
@ -435,15 +434,15 @@
+ u32 sys_freq; /* System frequency in Hz */ + u32 sys_freq; /* System frequency in Hz */
+ u32 cnt_freq; /* Calculated C0_COUNT frequency */ + u32 cnt_freq; /* Calculated C0_COUNT frequency */
+ +
+ u8 wlan0_mac[6]; + u8 wlan0_mac[ETH_ALEN];
+ u8 enet0_mac[6]; + u8 enet0_mac[ETH_ALEN];
+ u8 enet1_mac[6]; + u8 enet1_mac[ETH_ALEN];
+ +
+ u16 pci_id; /* Pseudo PCIID for common code */ + u16 pci_id; /* Pseudo PCIID for common code */
+ u16 mem_cap; /* cap bank1 in MB */ + u16 mem_cap; /* cap bank1 in MB */
+ +
+ /* version 3 */ + /* version 3 */
+ u8 wlan1_mac[6]; /* (ar5212) */ + u8 wlan1_mac[ETH_ALEN]; /* (ar5212) */
+}; +};
+ +
+#define BOARD_CONFIG_BUFSZ 0x1000 +#define BOARD_CONFIG_BUFSZ 0x1000
@ -1929,12 +1928,12 @@
+#endif +#endif
+ +
+ /* Fix up MAC addresses if necessary */ + /* Fix up MAC addresses if necessary */
+ if (!memcmp(config->enet0_mac, "\xff\xff\xff\xff\xff\xff", 6)) + if (is_broadcast_ether_addr(config->enet0_mac))
+ memcpy(config->enet0_mac, config->enet1_mac, 6); + ether_addr_copy(config->enet0_mac, config->enet1_mac);
+ +
+ /* If ENET0 and ENET1 have the same mac address, + /* If ENET0 and ENET1 have the same mac address,
+ * increment the one from ENET1 */ + * increment the one from ENET1 */
+ if (memcmp(config->enet0_mac, config->enet1_mac, 6) == 0) { + if (ether_addr_equal(config->enet0_mac, config->enet1_mac)) {
+ c = config->enet1_mac + 5; + c = config->enet1_mac + 5;
+ while ((c >= config->enet1_mac) && !(++(*c))) + while ((c >= config->enet1_mac) && !(++(*c)))
+ c--; + c--;