From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 15 Oct 2006 15:32:14 +0000 (+0000)
Subject: remove the wifi interface from the default bridge
X-Git-Tag: reboot~30682
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cb3692258e40cc4f9431a6ee716eed1cc6dceb3b;p=openwrt%2Fopenwrt.git

remove the wifi interface from the default bridge

SVN-Revision: 5114
---

diff --git a/package/base-files/brcm-2.4/etc/init.d/S05netconfig b/package/base-files/brcm-2.4/etc/init.d/S05netconfig
index 71092da559..7c36183896 100755
--- a/package/base-files/brcm-2.4/etc/init.d/S05netconfig
+++ b/package/base-files/brcm-2.4/etc/init.d/S05netconfig
@@ -20,7 +20,7 @@ start() {
 	
 	BEGIN {
 		FS="="
-		c["lan_ifname"]="eth0.0 wl0"
+		c["lan_ifname"]="eth0.0"
 		c["wan_ifname"]="eth0.1"
 		c["vlan0ports"]="1 2 3 4 5*"
 		c["vlan1ports"]="0 5"
@@ -35,14 +35,13 @@ start() {
 		if (nvram["boardtype"] == "bcm94710dev") {
 			# Asus WL-500g
 			if (nvram["boardnum"] == "asusX") {
-				c["lan_ifname"]="eth0 eth1 wl0" # FIXME
+				c["lan_ifname"]="eth0 eth1" # FIXME
 				c["wan_ifname"]=""
 			}
 		}
 		if (nvram["boardtype"] == "wgt634u") {
 			c["vlan0ports"] = "0 1 2 3 5*"
 			c["vlan1ports"] = "4 5"
-			c["lan_ifname"] = "eth0.0 ath0"
 		}
 		if ((nvram["boardtype"] == "0x0467") || (nvram["boardtype"] == "0x042f")) {
 			c["vlan0ports"] = "0 1 2 3 5*"
@@ -52,7 +51,7 @@ start() {
 		# WAP54G
 		if ((nvram["boardnum"] == "2") || \
 			(nvram["boardnum"] == "1024")) {
-			c["lan_ifname"]="eth0 wl0"
+			c["lan_ifname"]="eth0"
 			c["wan_ifname"]=""
 		}
 	
diff --git a/package/base-files/brcm-2.6/etc/init.d/S05netconfig b/package/base-files/brcm-2.6/etc/init.d/S05netconfig
index e37633e18f..846562690e 100755
--- a/package/base-files/brcm-2.6/etc/init.d/S05netconfig
+++ b/package/base-files/brcm-2.6/etc/init.d/S05netconfig
@@ -20,7 +20,7 @@ start() {
 	
 	BEGIN {
 		FS="="
-		c["lan_ifname"]="eth0.0 wl0"
+		c["lan_ifname"]="eth0.0"
 		c["wan_ifname"]="eth0.1"
 		c["vlan0ports"]="1 2 3 4 5*"
 		c["vlan1ports"]="0 5"
@@ -35,14 +35,13 @@ start() {
 		if (nvram["boardtype"] == "bcm94710dev") {
 			# Asus WL-500g
 			if (nvram["boardnum"] == "asusX") {
-				c["lan_ifname"]="eth0 eth1 wl0" # FIXME
+				c["lan_ifname"]="eth0 eth1" # FIXME
 				c["wan_ifname"]=""
 			}
 		}
 		if (nvram["boardtype"] == "wgt634u") {
 			c["vlan0ports"] = "0 1 2 3 5*"
 			c["vlan1ports"] = "4 5"
-			c["lan_ifname"] = "eth0.0 ath0"
 		}
 		if ((nvram["boardtype"] == "0x0467") || (nvram["boardtype"] == "0x042f")) {
 			c["vlan0ports"] = "0 1 2 3 5*"
@@ -52,7 +51,7 @@ start() {
 		# WAP54G
 		if ((nvram["boardnum"] == "2") || \
 			(nvram["boardnum"] == "1024")) {
-			c["lan_ifname"]="eth0 wl0"
+			c["lan_ifname"]="eth0"
 			c["wan_ifname"]=""
 		}