From 313556e91e26db6ff3a7be76a877480ba428636c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 15 Oct 2006 15:50:02 +0000 Subject: remove all broadcom interfaces from bridges and bring them down completely when wifi down is called SVN-Revision: 5116 --- package/base-files/default/lib/network/config.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'package/base-files/default/lib') diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh index 18f794a..a66c92b 100755 --- 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 + 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" @@ -141,3 +146,15 @@ setup_interface() { 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 + } +} -- cgit v1.1