mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-26 00:47:22 +02:00
[package] sync macs with vif bssids in broadcom.sh, fixes multi-ssid with wpa
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15028 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
37ba089669
commit
6d85891fde
@ -231,6 +231,7 @@ setup_interface() {
|
|||||||
# Interface settings
|
# Interface settings
|
||||||
config_get mtu "$config" mtu
|
config_get mtu "$config" mtu
|
||||||
config_get macaddr "$config" macaddr
|
config_get macaddr "$config" macaddr
|
||||||
|
macaddr="${macaddr:-$3}"
|
||||||
grep "$iface:" /proc/net/dev > /dev/null && \
|
grep "$iface:" /proc/net/dev > /dev/null && \
|
||||||
$DEBUG ifconfig "$iface" down && \
|
$DEBUG ifconfig "$iface" down && \
|
||||||
$DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
|
$DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
|
||||||
|
@ -70,7 +70,7 @@ start_net() {(
|
|||||||
[ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
|
[ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
|
||||||
include /lib/network
|
include /lib/network
|
||||||
scan_interfaces
|
scan_interfaces
|
||||||
setup_interface "$1" "$2"
|
setup_interface "$1" "$2" "$3"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
set_wifi_up() {
|
set_wifi_up() {
|
||||||
|
@ -251,8 +251,8 @@ enable_broadcom() {
|
|||||||
net_cfg="$(find_net_config "$vif")"
|
net_cfg="$(find_net_config "$vif")"
|
||||||
[ -z "$net_cfg" ] || {
|
[ -z "$net_cfg" ] || {
|
||||||
bridge="$(bridge_interface "$net_cfg")"
|
bridge="$(bridge_interface "$net_cfg")"
|
||||||
append if_up "start_net '$ifname' '$net_cfg'" ";$N"
|
|
||||||
append if_up "set_wifi_up '$vif' '$ifname'" ";$N"
|
append if_up "set_wifi_up '$vif' '$ifname'" ";$N"
|
||||||
|
append if_up "start_net '$ifname' '$net_cfg' \$(wlc ifname '$ifname' bssid)" ";$N"
|
||||||
}
|
}
|
||||||
[ -z "$nasopts" ] || {
|
[ -z "$nasopts" ] || {
|
||||||
eval "${vif}_ssid=\"\$ssid\""
|
eval "${vif}_ssid=\"\$ssid\""
|
||||||
|
Loading…
Reference in New Issue
Block a user