[kernel] generic-2.6/2.6.30: gets rid of the length limitation on the name in the...

[openwrt.git] / target / linux / atheros / patches-2.6.28 / 100-board.patch

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 6f27d1a..587094d 100644 (file)
--- 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
 +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
 +/*
 + * 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");
 +              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);
 +              }
 +                      random_ether_addr(config->enet0_mac);
 +                      random_ether_addr(config->enet1_mac);
 +              }


@@ -1924,7 +1926,7 @@
 +              if (!ar231x_board.radio)
 +                      return 0;
 +
 +              if (!ar231x_board.radio)
 +                      return 0;
 +

-+              if (*((u32 *) ar231x_board.radio) & AR531X_RADIO0_MASK)
++              if (*((u32 *) radio) & AR531X_RADIO0_MASK)

 +                      ar231x_add_wmac(0, AR531X_WLAN0,
 +                              AR5312_IRQ_WLAN0_INTRS);
 +
 +                      ar231x_add_wmac(0, AR531X_WLAN0,
 +                              AR5312_IRQ_WLAN0_INTRS);
 +


@@ -1948,7 +1950,7 @@
 +              break;
 +      }
 +
 +              break;
 +      }
 +

-+      if (*((u32 *) ar231x_board.radio) & AR531X_RADIO1_MASK)
++      if (*((u32 *) radio) & AR531X_RADIO1_MASK)

 +              ar231x_add_wmac(1, AR531X_WLAN1,
 +                      AR5312_IRQ_WLAN1_INTRS);
 +
 +              ar231x_add_wmac(1, AR531X_WLAN1,
 +                      AR5312_IRQ_WLAN1_INTRS);
 +


@@ -2096,7 +2098,7 @@
 +
 --- /dev/null
 +++ b/arch/mips/ar231x/ar2315.c
 +
 --- /dev/null
 +++ b/arch/mips/ar231x/ar2315.c

-@@ -0,0 +1,679 @@
+@@ -0,0 +1,677 @@

 +/*
 + * 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
 +/*
 + * 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


@@ -2149,10 +2151,8 @@
 +
 +      if (pend) {
 +              bit = fls(pend) - 1;
 +
 +      if (pend) {
 +              bit = fls(pend) - 1;

-+              printk("GPIO IRQ: pend=0x%08x, val=%08x, bit=%d\n", pend, gpiointval, bit);

 +              pend &= ~(1 << bit);
 +              gpiointval ^= (1 << bit);
 +              pend &= ~(1 << bit);
 +              gpiointval ^= (1 << bit);

-+              printk("AFTER IRQ: pend=0x%08x, val=%08x, bit=%d\n", pend, gpiointval, bit);

 +      }
 +
 +      if (!pend)
 +      }
 +
 +      if (!pend)