enable start-stop-daemon by default, i want to use this to clean up a few init script...

[openwrt/staging/dedeckeh.git] / target / linux / adm5120-2.6 / files / arch / mips / adm5120 / boards / mikrotik.c

diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/mikrotik.c b/target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/mikrotik.c
index 5fa75281c4c29167cfa6a725e6585659e50cb822..f233772d0d8d50fcc5e1f240c702718039be981f 100644 (file)
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/mikrotik.c
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/mikrotik.c
@@ -4,7 +4,7 @@
  *  Mikrotik RouterBOARDs 111/112/133/133C/150/153
  *
  *  Copyright (C) 2007 OpenWrt.org
- *  Copyright (C) 2007 Gabor Juhos <juhosg@freemail.hu>
+ *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -64,6 +64,11 @@ static void __init rb1xx_setup(void)
        /* TODO: setup mac address */
 }
 
+#if 0
+/*
+ * RB1xx boards have bad network performance with the default VLAN matrixes.
+ * Disable it while the ethernet driver gets fixed.
+ */
 static unsigned char rb11x_vlans[6] __initdata = {
        /* FIXME: untested */
        0x41, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -71,7 +76,7 @@ static unsigned char rb11x_vlans[6] __initdata = {
 
 static unsigned char rb133_vlans[6] __initdata = {
        /* FIXME: untested */
-       0x41, 0x42, 0x44, 0x00, 0x00, 0x00
+       0x44, 0x42, 0x41, 0x00, 0x00, 0x00
 };
 
 static unsigned char rb133c_vlans[6] __initdata = {
@@ -83,6 +88,15 @@ static unsigned char rb15x_vlans[6] __initdata = {
        /* FIXME: untested */
        0x41, 0x42, 0x44, 0x48, 0x50, 0x00
 };
+#else
+static unsigned char rb_vlans[6] __initdata = {
+       0x7F, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+#define rb11x_vlans    rb_vlans
+#define rb133_vlans    rb_vlans
+#define rb133c_vlans   rb_vlans
+#define rb15x_vlans    rb_vlans
+#endif
 
 static struct adm5120_board rb111_board __initdata = {
        .mach_type      = MACH_ADM5120_RB_111,