generic: rtl8366: prevent modifications of VLAN 0

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

diff --git a/target/linux/atheros/patches-2.6.32/100-board.patch b/target/linux/atheros/patches-2.6.32/100-board.patch
index cfa78cd..c798975 100644 (file)
--- a/target/linux/atheros/patches-2.6.32/100-board.patch
+++ b/target/linux/atheros/patches-2.6.32/100-board.patch
@@ -1557,7 +1557,7 @@
 +
 --- /dev/null
 +++ b/arch/mips/ar231x/ar5312.c
-@@ -0,0 +1,547 @@
+@@ -0,0 +1,549 @@
 +/*
 + * 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
@@ -1940,7 +1940,8 @@
 +              if (!ar231x_board.radio)
 +                      return 0;
 +
-+              if (*((u32 *) radio) & AR531X_RADIO0_MASK)
++              if ((*((u32 *) radio) & AR531X_RADIO0_MASK) &&
++                  (config->flags & BD_WLAN0))
 +                      ar231x_add_wmac(0, AR531X_WLAN0,
 +                              AR5312_IRQ_WLAN0_INTRS);
 +
@@ -1964,7 +1965,8 @@
 +              break;
 +      }
 +
-+      if (*((u32 *) radio) & AR531X_RADIO1_MASK)
++      if ((*((u32 *) radio) & AR531X_RADIO1_MASK) &&
++          (config->flags & BD_WLAN1))
 +              ar231x_add_wmac(1, AR531X_WLAN1,
 +                      AR5312_IRQ_WLAN1_INTRS);
 +