diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-20 13:19:25 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-20 13:19:25 +0000 |
| commit | bd75f9f7686cd48e362eeb85ecb4e60a8003b92e (patch) | |
| tree | 355507675b17aed4371afef555ee0a708f5ffa43 | |
| parent | 8940134da1cf74531e4011f4bb45f8042db22278 (diff) | |
atheros: register wmac device only if it is enabled in the board config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21038 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/atheros/patches-2.6.30/100-board.patch | 8 | ||||
| -rw-r--r-- | target/linux/atheros/patches-2.6.32/100-board.patch | 8 | ||||
| -rw-r--r-- | target/linux/atheros/patches-2.6.33/100-board.patch | 8 |
3 files changed, 15 insertions, 9 deletions
diff --git a/target/linux/atheros/patches-2.6.30/100-board.patch b/target/linux/atheros/patches-2.6.30/100-board.patch index 5f51293714..8183fb8aa2 100644 --- a/target/linux/atheros/patches-2.6.30/100-board.patch +++ b/target/linux/atheros/patches-2.6.30/100-board.patch @@ -1555,7 +1555,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 @@ -1938,7 +1938,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); + @@ -1962,7 +1963,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); + 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 cfa78cdf9e..c798975953 100644 --- 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); + diff --git a/target/linux/atheros/patches-2.6.33/100-board.patch b/target/linux/atheros/patches-2.6.33/100-board.patch index 8ecce331b5..6cf6ddbfbf 100644 --- a/target/linux/atheros/patches-2.6.33/100-board.patch +++ b/target/linux/atheros/patches-2.6.33/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); + |