more wpa+wds patches
SVN-Revision: 7888
This commit is contained in:
parent
921cbfe002
commit
9a785f0b0a
3 changed files with 8 additions and 4 deletions
|
@ -91,7 +91,6 @@ prepare_interface() {
|
|||
case "$iftype" in
|
||||
bridge)
|
||||
[ -x /usr/sbin/brctl ] && {
|
||||
ifconfig "$iface" up 2>/dev/null >/dev/null
|
||||
ifconfig "br-$config" 2>/dev/null >/dev/null && {
|
||||
$DEBUG brctl addif "br-$config" "$iface"
|
||||
# Bridge existed already. No further processing necesary
|
||||
|
@ -104,6 +103,7 @@ prepare_interface() {
|
|||
# result in another setup_interface() call, so we simply stop processing
|
||||
# the current event at this point.
|
||||
}
|
||||
ifconfig "$iface" up 2>/dev/null >/dev/null
|
||||
return 1
|
||||
}
|
||||
;;
|
||||
|
|
|
@ -16,6 +16,7 @@ setup_broadcom_wds() {
|
|||
[ -z "$network" ] && return
|
||||
|
||||
config_get addr "$CONFIG_SECTION" bssid
|
||||
addr=$(echo "$addr" | tr 'A-F' 'a-f')
|
||||
[ "$addr" = "$remote" ] && {
|
||||
local cfg="$CONFIG_SECTION"
|
||||
|
||||
|
@ -28,8 +29,11 @@ setup_broadcom_wds() {
|
|||
config_get key "$cfg" key
|
||||
config_get ssid "$cfg" ssid
|
||||
|
||||
[ "$encryption" == "psk" ] && \
|
||||
nas4not lan "$iface" up auto aes "$encryption" "$key" "$ssid"
|
||||
[ "$encryption" != "none" ] && {
|
||||
sleep 1
|
||||
nas4not lan "$iface" up auto aes "$encryption" "$key" "$ssid"
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -191,7 +191,7 @@ enable_broadcom() {
|
|||
append vif_post_up "enabled 1" "$N"
|
||||
|
||||
config_get ifname "$vif" ifname
|
||||
append if_up "ifconfig $ifname up" ";$N"
|
||||
#append if_up "ifconfig $ifname up" ";$N"
|
||||
local net_cfg bridge
|
||||
net_cfg="$(find_net_config "$vif")"
|
||||
[ -z "$net_cfg" ] || {
|
||||
|
|
Loading…
Reference in a new issue