projects
/
lede-git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5fee218
)
remove all broadcom interfaces from bridges and bring them down completely when wifi...
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 15 Oct 2006 15:50:02 +0000
(15:50 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 15 Oct 2006 15:50:02 +0000
(15:50 +0000)
SVN-Revision: 5116
package/base-files/default/lib/network/config.sh
patch
|
blob
|
history
package/base-files/default/sbin/ifup
patch
|
blob
|
history
package/broadcom-wl/files/lib/wifi/broadcom.sh
patch
|
blob
|
history
diff --git
a/package/base-files/default/lib/network/config.sh
b/package/base-files/default/lib/network/config.sh
index 18f794a31b25a1c32d9366983d6d6cfaee30969a..a66c92bc033198a011debb05d382d6d23f03ca81 100755
(executable)
--- a/
package/base-files/default/lib/network/config.sh
+++ b/
package/base-files/default/lib/network/config.sh
@@
-70,6
+70,11
@@
setup_interface() {
proto="${3:-$(config_get "$config" proto)}"
config_get iftype "$config" type
proto="${3:-$(config_get "$config" proto)}"
config_get iftype "$config" type
+ ifconfig "$iface" 2>/dev/null >/dev/null && {
+ # make sure the interface is removed from any existing bridge
+ unbridge "$iface"
+ }
+
# Setup VLAN interfaces
add_vlan "$iface"
# Setup VLAN interfaces
add_vlan "$iface"
@@
-141,3
+146,15
@@
setup_interface() {
esac
}
esac
}
+unbridge() {
+ local dev="$1"
+ local brdev
+
+ brctl show | grep "$dev" >/dev/null && {
+ # interface is still part of a bridge, correct that
+
+ for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
+ brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
+ done
+ }
+}
diff --git
a/package/base-files/default/sbin/ifup
b/package/base-files/default/sbin/ifup
index 35b2fc4cdd4f5bd9d88077c63a39230b2bfec754..c7055d4807b976bbec0d16d0fdc7a53f4f1b5479 100755
(executable)
--- a/
package/base-files/default/sbin/ifup
+++ b/
package/base-files/default/sbin/ifup
@@
-10,12
+10,5
@@
case "$iftype" in
esac
for dev in $ifname; do
esac
for dev in $ifname; do
- brctl show | grep "$dev" >/dev/null && {
- # interface is still part of a bridge, correct that
-
- for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
- brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
- done
- }
setup_interface "$dev" "$1"
done
setup_interface "$dev" "$1"
done
diff --git
a/package/broadcom-wl/files/lib/wifi/broadcom.sh
b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 1ce85c4c5f474ef2577a40f6f501bb658dfc57d7..b598952e9dc013e4aedccefbc6af998f97e93a0f 100644
(file)
--- a/
package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/
package/broadcom-wl/files/lib/wifi/broadcom.sh
@@
-75,7
+75,17
@@
scan_broadcom() {
disable_broadcom() {
wlc down
disable_broadcom() {
wlc down
- ifconfig wl0 down
+ (
+ include /lib/network
+ scan_interfaces
+
+ # make sure the interfaces are down and removed from all bridges
+ for dev in wl0 wl0.1 wl0.2 wl0.3; do
+ ifconfig "$dev" down 2>/dev/null >/dev/null && {
+ unbridge "$dev"
+ }
+ done
+ )
}
enable_broadcom() {
}
enable_broadcom() {