diff options
author | Felix Fietkau <nbd@openwrt.org> | 2009-04-21 18:48:59 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2009-04-21 18:48:59 +0000 |
commit | 766233c0cd1d92b313290d93578ae411ed12a46a (patch) | |
tree | 2df1d15f833b96eed1f35b9d85dde6417357b28d /target/linux/atheros/patches-2.6.28 | |
parent | 65d8376aa1457091413f20c90faa75d090bb8965 (diff) | |
download | master-187ad058-766233c0cd1d92b313290d93578ae411ed12a46a.tar.gz master-187ad058-766233c0cd1d92b313290d93578ae411ed12a46a.tar.bz2 master-187ad058-766233c0cd1d92b313290d93578ae411ed12a46a.zip |
atheros: fix up the wlan mac address if the board data is missing
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15330 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-2.6.28')
-rw-r--r-- | target/linux/atheros/patches-2.6.28/100-board.patch | 4 | ||||
-rw-r--r-- | target/linux/atheros/patches-2.6.28/105-ar2315_pci.patch | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/atheros/patches-2.6.28/100-board.patch b/target/linux/atheros/patches-2.6.28/100-board.patch index 8b76d07c38..587094d268 100644 --- a/target/linux/atheros/patches-2.6.28/100-board.patch +++ b/target/linux/atheros/patches-2.6.28/100-board.patch @@ -82,7 +82,7 @@ +obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o --- /dev/null +++ b/arch/mips/ar231x/board.c -@@ -0,0 +1,247 @@ +@@ -0,0 +1,249 @@ +/* + * 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 @@ -251,6 +251,8 @@ + config = ar231x_board.config; + if (!memcmp(config->enet0_mac, "\x00\x00\x00\x00\x00\x00", 6)) { + printk(KERN_INFO "Fixing up empty mac addresses\n"); ++ random_ether_addr(config->wlan0_mac); ++ config->wlan0_mac[0] &= ~0x06; + random_ether_addr(config->enet0_mac); + random_ether_addr(config->enet1_mac); + } diff --git a/target/linux/atheros/patches-2.6.28/105-ar2315_pci.patch b/target/linux/atheros/patches-2.6.28/105-ar2315_pci.patch index 9b76dfee46..7c5afbdb83 100644 --- a/target/linux/atheros/patches-2.6.28/105-ar2315_pci.patch +++ b/target/linux/atheros/patches-2.6.28/105-ar2315_pci.patch @@ -256,7 +256,7 @@ + default y --- a/arch/mips/ar231x/ar2315.c +++ b/arch/mips/ar231x/ar2315.c -@@ -63,6 +63,27 @@ static inline void ar2315_gpio_irq(void) +@@ -61,6 +61,27 @@ static inline void ar2315_gpio_irq(void) do_IRQ(AR531X_GPIO_IRQ_BASE + bit); } @@ -284,7 +284,7 @@ /* * Called when an interrupt is received, this function -@@ -81,6 +102,10 @@ ar2315_irq_dispatch(void) +@@ -79,6 +100,10 @@ ar2315_irq_dispatch(void) do_IRQ(AR2315_IRQ_WLAN0_INTRS); else if (pending & CAUSEF_IP4) do_IRQ(AR2315_IRQ_ENET0_INTRS); |